WPF: Possible fix for NullReferenceException in OnTooltipTimerTick

Resolves #2134
cefsharp · Aug 31, 2017 · 8a14405 · 8a14405
1 parent bad729e
commit 8a14405
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/CefSharp.Wpf/ChromiumWebBrowser.cs b/CefSharp.Wpf/ChromiumWebBrowser.cs
@@ -1905,9 +1905,13 @@ private void SetPopupSizeAndPositionImpl(int width, int height, int x, int y)
         /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
         private void OnTooltipTimerTick(object sender, EventArgs e)
         {
-            tooltipTimer.Stop();
+            // Checks to see if the control is disposed/disposing
+            if (Interlocked.CompareExchange(ref disposeCount, 1, 1) != 1)
+            {
+                tooltipTimer.Stop();
 
-            UpdateTooltip(TooltipText);
+                UpdateTooltip(TooltipText);
+            }
         }
 
         /// <summary>