Create BrowserSettings in ChromiumWebBrowser constructor and explicit…

…ly call Dispose (it references an unmanaged resource)
cefsharp · Dec 16, 2014 · 25203c5 · 25203c5
1 parent 7bc7cd2
commit 25203c5
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/CefSharp.Wpf/ChromiumWebBrowser.cs b/CefSharp.Wpf/ChromiumWebBrowser.cs
@@ -338,6 +338,9 @@ public void Dispose()
 
         protected virtual void Dispose(bool isdisposing)
         {
+            BrowserSettings.Dispose();
+
+            BrowserSettings = null;
             ResourceHandler = null;
 
             Loaded -= OnLoaded;
@@ -470,6 +473,7 @@ public ChromiumWebBrowser()
             disposables.Add(new DisposableEventWrapper(this, ActualWidthProperty, OnActualSizeChanged));
 
             ResourceHandler = new DefaultResourceHandler();
+            BrowserSettings = new BrowserSettings();
         }
 
         ~ChromiumWebBrowser()
@@ -484,7 +488,7 @@ private void CreateOffscreenBrowserWhenActualSizeChanged()
                 return;
             }
 
-            managedCefBrowserAdapter.CreateOffscreenBrowser(BrowserSettings ?? new BrowserSettings(), Address);
+            managedCefBrowserAdapter.CreateOffscreenBrowser(BrowserSettings, Address);
             browserCreated = true;
         }