sasiit23
diff --git a/‎CefSharp.MinimalExample.WinForms/Controls/ControlExtensions.cs‎
Lines changed: 27 additions & 19 deletions b/‎CefSharp.MinimalExample.WinForms/Controls/ControlExtensions.cs‎
Lines changed: 27 additions & 19 deletions
@@ -7,23 +7,31 @@
 
 namespace CefSharp.MinimalExample.WinForms.Controls
 {
-	public static class ControlExtensions
-	{
-		/// <summary>
-		/// Executes the Action asynchronously on the UI thread, does not block execution on the calling thread.
-		/// </summary>
-		/// <param name="control">the control for which the update is required</param>
-		/// <param name="action">action to be performed on the control</param>
-		public static void InvokeOnUiThreadIfRequired(this Control control, Action action)
-		{
-			if (control.InvokeRequired)
-			{
-				control.BeginInvoke(action);
-			}
-			else
-			{
-				action.Invoke();
-			}
-		}
-	}
+    public static class ControlExtensions
+    {
+        /// <summary>
+        /// Executes the Action asynchronously on the UI thread, does not block execution on the calling thread.
+        /// </summary>
+        /// <param name="control">the control for which the update is required</param>
+        /// <param name="action">action to be performed on the control</param>
+        public static void InvokeOnUiThreadIfRequired(this Control control, Action action)
+        {
+            //If you are planning on using a similar function in your own code then please be sure to
+            //have a quick read over https://stackoverflow.com/questions/1874728/avoid-calling-invoke-when-the-control-is-disposed
+            //No action
+            if (control.Disposing || control.IsDisposed || !control.IsHandleCreated)
+            {
+                return;
+            }
+
+            if (control.InvokeRequired)
+            {
+                control.BeginInvoke(action);
+            }
+            else
+            {
+                action.Invoke();
+            }
+        }
+    }
 }