Changeset 3266 for trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/AsynchronousContentView.cs

Timestamp:

04/05/10 05:53:30 (14 years ago)

Author:

swagner

Message:

Fixed type of caught exceptions in AsynchronousContentView (#953).

File:

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

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

@@ -28 +28 @@
       IAsyncResult result = BeginInvoke(method);
       result.AsyncWaitHandle.WaitOne(1000, false);
-      if (result.IsCompleted) EndInvoke(result);
+      if (result.IsCompleted) try { EndInvoke(result); } catch (ObjectDisposedException) { }
       else {
         ThreadPool.RegisterWaitForSingleObject(result.AsyncWaitHandle,
-          new WaitOrTimerCallback((x, b) => { try { EndInvoke(result); } catch (InvalidOperationException) { } }),
+          new WaitOrTimerCallback((x, b) => { try { EndInvoke(result); } catch (ObjectDisposedException) { } }),
           null, -1, true);
       }
@@ -45 +45 @@
       IAsyncResult result = BeginInvoke(method, args);
       result.AsyncWaitHandle.WaitOne(1000, false);
-      if (result.IsCompleted) EndInvoke(result);
+      if (result.IsCompleted) try { EndInvoke(result); } catch (ObjectDisposedException) { }
       else {
         ThreadPool.RegisterWaitForSingleObject(result.AsyncWaitHandle,
-          new WaitOrTimerCallback((x, b) => { try { EndInvoke(result); } catch (InvalidOperationException) { } }),
+          new WaitOrTimerCallback((x, b) => { try { EndInvoke(result); } catch (ObjectDisposedException) { } }),
           null, -1, true);
       }