LifeSpanHandler - Don't set to null on Dispose

Resolves #10
cefsharp · Apr 5, 2021 · f02eb3a · f02eb3a
1 parent b4eba31
commit f02eb3a
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/CefSharp.Wpf.HwndHost/ChromiumWebBrowser.cs b/CefSharp.Wpf.HwndHost/ChromiumWebBrowser.cs
@@ -751,8 +751,10 @@ private void InternalDispose(bool disposing)
                 TitleChanged = null;
                 JavascriptMessageReceived = null;
 
-                // Release reference to handlers, except LifeSpanHandler which is done after Disposing
-                // ManagedCefBrowserAdapter otherwise the ILifeSpanHandler.DoClose will not be invoked.
+                // Release reference to handlers, except LifeSpanHandler which we don't set to null
+                //so that ILifeSpanHandler.DoClose will not be invoked. Previously we set LifeSpanHandler = null
+                //after managedCefBrowserAdapter.Dispose, there's still cases where the LifeSpanHandler was null
+                //when DoClose was called Issue https://github.com/cefsharp/CefSharp.Wpf.HwndHost/issues/10
                 FindHandler = null;
                 DialogHandler = null;
                 RequestHandler = null;
@@ -771,10 +773,6 @@ private void InternalDispose(bool disposing)
 
                 managedCefBrowserAdapter?.Dispose();
                 managedCefBrowserAdapter = null;
-
-                // LifeSpanHandler is set to null after managedCefBrowserAdapter.Dispose so ILifeSpanHandler.DoClose
-                // is called.
-                LifeSpanHandler = null;
             }
 
             Cef.RemoveDisposable(this);