fix: Check if WebView2 is available before using it (Jorixon#135)

yuukidach · Mar 22, 2024 · 1bba6e6 · 1bba6e6
1 parent 9b882e2
commit 1bba6e6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/GIMI-ModManager.WinUI/Views/ModUpdateAvailableWindow.xaml b/src/GIMI-ModManager.WinUI/Views/ModUpdateAvailableWindow.xaml
@@ -184,7 +184,8 @@
                     <WebView2
                         x:Name="ModPageBrowser"
                         DefaultBackgroundColor="Transparent"
-                        Source="{x:Bind ViewModel.ModPage, Mode=TwoWay}" />
+                        Source="{x:Bind ViewModel.ModPage, Mode=TwoWay}"
+                        Visibility="Collapsed" />
                 </Grid>
 
             </Grid>

diff --git a/src/GIMI-ModManager.WinUI/Views/ModUpdateAvailableWindow.xaml.cs b/src/GIMI-ModManager.WinUI/Views/ModUpdateAvailableWindow.xaml.cs
@@ -13,6 +13,8 @@ public sealed partial class ModUpdateAvailableWindow : WindowEx
     public readonly ModUpdateVM ViewModel;
     public readonly IThemeSelectorService ThemeSelectorService = App.GetService<IThemeSelectorService>();
 
+    public bool WebViewIsAvailable = false;
+
     //private bool _isFirstTimeNavigation = true;
 
     public ModUpdateAvailableWindow(Guid notificationId)
@@ -25,6 +27,24 @@ public ModUpdateAvailableWindow(Guid notificationId)
             rootElement.RequestedTheme = ThemeSelectorService.Theme;
         }
 
+
+        InitWebView();
+    }
+
+    private void InitWebView()
+    {
+        try
+        {
+            CoreWebView2Environment.GetAvailableBrowserVersionString();
+        }
+        catch (Exception e)
+        {
+            return;
+        }
+
+        WebViewIsAvailable = true;
+        ModPageBrowser.Visibility = Visibility.Visible;
+
         ModPageBrowser.Loading += async (_, _) =>
         {
             await ModPageBrowser.EnsureCoreWebView2Async();
@@ -64,6 +84,8 @@ public ModUpdateAvailableWindow(Guid notificationId)
 
     private async void ButtonBase_OnClick(object sender, RoutedEventArgs e)
     {
+        if (!WebViewIsAvailable)
+            return;
         await ModPageBrowser.EnsureCoreWebView2Async();
 
         if (ModPageBrowser.CoreWebView2.IsDefaultDownloadDialogOpen)