Merge pull request #2092 from lubos/develop

Fixing WebView2 detection mechanism
picoe · Dec 23, 2021 · 84b2f0c · 84b2f0c
2 parents 1e8142d + 3f67e0f
commit 84b2f0c
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/Eto.Wpf/Forms/Controls/WebView2Handler.cs b/src/Eto.Wpf/Forms/Controls/WebView2Handler.cs
@@ -68,9 +68,15 @@ public static bool Detect()
 #if TEST_INSTALL
 			return false;
 #endif
-			var versionInfo = CoreWebView2Environment.GetAvailableBrowserVersionString();
-			// If versionInfo is NULL, the WebView2 Runtime isn't currently installed on the client.
-			return versionInfo != null;
+			try
+			{
+				var versionInfo = CoreWebView2Environment.GetAvailableBrowserVersionString();
+				return versionInfo != null;
+			}
+			catch (WebView2RuntimeNotFoundException)
+			{
+				return false;
+			}
 		}
 
 		/// <summary>