Changeset 1769 for branches/eraser6/CodeReview/Eraser.Manager/DirectExecutor.cs

Timestamp:

2/8/2010 7:29:41 AM (2 years ago)

Author:

lowjoel

Message:

Updated to trunk r1764

Location:

branches/eraser6/CodeReview

Files:

• . (modified) (1 prop)
• Eraser.Manager/DirectExecutor.cs (modified) (2 diffs)

branches/eraser6/CodeReview/Eraser.Manager/DirectExecutor.cs

@@ -55 +55 @@
                 thread.Abort();
                 schedulerInterrupt.Set();
+
+                //Wait for the executor thread to exit -- we call some event functions
+                //and these events may need invocation on the main thread. So,
+                //pump messages from the main thread until the thread exits.
+                if (System.Windows.Forms.Application.MessageLoop)
+                {
+                    if (!thread.Join(new TimeSpan(0, 0, 0, 0, 100)))
+                        System.Windows.Forms.Application.DoEvents();
+                }
+
+                //If we are disposing on a secondary thread, or a thread without
+                //a message loop, just wait for the thread to exit indefinitely
+                else
+                    thread.Join();
+
                 schedulerInterrupt.Close();
             }
@@ -615 +630 @@
                             "not be erased because the file was either compressed, encrypted or " +
                             "a sparse file.", info.FullName), LogLevel.Error));
+                        continue;
                     }