Merge pull request #2258 from cwensley/curtis/webview2-check-disposed

Wpf: Check if WebView is disposed or not before sending events asynchronously
picoe · Jul 15, 2022 · 79e2c5c · 79e2c5c
2 parents 7f1eb2f + 10f0bff
commit 79e2c5c
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/Eto.Wpf/Forms/Controls/WebView2Handler.cs b/src/Eto.Wpf/Forms/Controls/WebView2Handler.cs
@@ -480,6 +480,9 @@ void Control_CoreWebView2Ready(object sender, CoreWebView2InitializationComplete
 
 		private void RunDelayedActions()
 		{
+			if (Widget.IsDisposed)
+				return;
+
 			Control.CoreWebView2.DocumentTitleChanged += CoreWebView2_DocumentTitleChanged;
 			Control.CoreWebView2.NewWindowRequested += CoreWebView2_NewWindowRequested;
 			webView2Ready = true;
@@ -583,7 +586,11 @@ private void Control_NavigationStarting(object sender, CoreWebView2NavigationSta
 		private void Control_NavigationCompleted(object sender, CoreWebView2NavigationCompletedEventArgs e)
 		{
 			var args = new WebViewLoadedEventArgs(Control.Source);
-			Application.Instance.AsyncInvoke(() => Callback.OnDocumentLoaded(Widget, args));
+			Application.Instance.AsyncInvoke(() => {
+				if (Widget.IsDisposed)
+					return;
+				Callback.OnDocumentLoaded(Widget, args);
+			});
 		}
 
 		public Uri Url