diff --git a/CefSharp.Wpf/ChromiumWebBrowser.cs b/CefSharp.Wpf/ChromiumWebBrowser.cs index 88d67b6063..a2ac6435f1 100644 --- 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) /// The instance containing the event data. 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); + } } ///