Changeset 1754 for branches/eraser6/6.0

Timestamp:

2/8/2010 3:38:30 AM (2 years ago)

Author:

lowjoel

Message:

Fixed two errors in the code: when terminating the DirectExecutor? thread, we may return from Dispose before the thread exists. Call Join, pumping messages if it is on the main thread so that such invocation calls will not throw InvalidAsynchronousStateExceptions?. In addition, when erasing files which we cannot deal with (sparse/compressed/encrypted) we need to skip the file; the old code did not.

File:

• branches/eraser6/6.0/Eraser.Manager/DirectExecutor.cs (modified) (2 diffs)

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

@@ -56 +56 @@
                 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();
             }
@@ -760 +775 @@
                             "not be erased because the file was either compressed, encrypted or " +
                             "a sparse file.", info.FullName), LogLevel.Error));
+                        continue;
                     }