WPF - Fix Address Load being called multiple times after browser created

odo-leni · Oct 11, 2021 · 8bbe6a4 · 8bbe6a4
1 parent 0812ea9
commit 8bbe6a4
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/CefSharp.Wpf/ChromiumWebBrowser.cs b/CefSharp.Wpf/ChromiumWebBrowser.cs
@@ -91,6 +91,11 @@ public partial class ChromiumWebBrowser : Control, IRenderWebBrowser, IWpfWebBro
         /// </summary>
         private string initialAddress;
         /// <summary>
+        /// Used to stop multiple threads trying to load the initial Url multiple times.
+        /// If the Address property is bound after the browser is initialized
+        /// </summary>
+        private bool initialLoadCalled;
+        /// <summary>
         /// Has the underlying Cef Browser been created (slightly different to initialized in that
         /// the browser is initialized in an async fashion)
         /// </summary>
@@ -1109,7 +1114,7 @@ partial void OnAfterBrowserCreated(IBrowser browser)
                     SetCurrentValue(IsBrowserInitializedProperty, true);
 
                     // Only call Load if initialAddress is null and Address is not empty
-                    if (string.IsNullOrEmpty(initialAddress) && !string.IsNullOrEmpty(Address))
+                    if (string.IsNullOrEmpty(initialAddress) && !string.IsNullOrEmpty(Address) && !initialLoadCalled)
                     {
                         Load(Address);
                     }
@@ -2430,6 +2435,8 @@ public void Load(string url)
                 // or before OnApplyTemplate has been called
                 if (browser != null)
                 {
+                    initialLoadCalled = true;
+
                     using (var frame = browser.MainFrame)
                     {
                         frame.LoadUrl(url);