Changeset 3250 for trunk/sources

Timestamp:

04/01/10 15:36:10 (15 years ago)

Author:

mkommend

Message:

updated AsynchronousContentView to work semi-asynchronous (ticket #953)

File:

• trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/AsynchronousContentView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/AsynchronousContentView.cs

@@ -25 +25 @@
     /// <param name="method">The delegate to invoke.</param>
     protected new void Invoke(Delegate method) {
-      IAsyncResult res = base.BeginInvoke(method);
-      ThreadPool.RegisterWaitForSingleObject(res.AsyncWaitHandle,
-        new WaitOrTimerCallback((x, b) => { EndInvoke(res); }),
-        null, -1, true);
+      // prevent blocking of worker thread in Invoke, if the control is disposed
+      IAsyncResult result = BeginInvoke(method);
+      result.AsyncWaitHandle.WaitOne(1000, false);
+      if (result.IsCompleted) EndInvoke(result);
+      else {
+        ThreadPool.RegisterWaitForSingleObject(result.AsyncWaitHandle,
+          new WaitOrTimerCallback((x, b) => { try { EndInvoke(result); } catch (InvalidOperationException) { } }),
+          null, -1, true);
+      }
     }
+
     /// <summary>
     /// Asynchronous call of GUI updating.
@@ -36 +42 @@
     /// <param name="args">The invoke arguments.</param>
     protected new void Invoke(Delegate method, params object[] args) {
-      IAsyncResult res = base.BeginInvoke(method, args);
-      ThreadPool.RegisterWaitForSingleObject(res.AsyncWaitHandle,
-        new WaitOrTimerCallback((x, b) => { EndInvoke(res); }),
-        null, -1, true);
+      // prevent blocking of worker thread in Invoke, if the control is disposed
+      IAsyncResult result = BeginInvoke(method, args);
+      result.AsyncWaitHandle.WaitOne(1000, false);
+      if (result.IsCompleted) EndInvoke(result);
+      else {
+        ThreadPool.RegisterWaitForSingleObject(result.AsyncWaitHandle,
+          new WaitOrTimerCallback((x, b) => { try { EndInvoke(result); } catch (InvalidOperationException) { } }),
+          null, -1, true);
+      }
     }
   }