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

Timestamp:

2/3/2010 3:37:13 AM (2 years ago)

Author:

lowjoel

Message:

Forward ported changes from trunk to r1743

Location:

branches/eraser6/CodeReview

Files:

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

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

@@ -275 +275 @@
                                 throw;
                             }
+                            catch (ThreadAbortException)
+                            {
+                            }
                             catch (Exception e)
                             {
@@ -417 +420 @@
                 fsManager.EraseClusterTips(VolumeInfo.FromMountPoint(target.Drive),
                     method, task.Log, searchProgress, eraseProgress);
-            }
-
+                tipProgress.MarkComplete();
+            }
+
+            bool lowDiskSpaceNotifications = Shell.LowDiskSpaceNotificationsEnabled;
             info = info.CreateSubdirectory(Path.GetFileName(
                 FileSystem.GenerateRandomFileName(info, 18)));
@@ -427 +432 @@
                 if (info.IsCompressed())
                     info.Uncompress();
+
+                //Disable the low disk space notifications
+                Shell.LowDiskSpaceNotificationsEnabled = false;
 
                 ProgressManager mainProgress = new ProgressManager();
@@ -515 +523 @@
                 fsManager.DeleteFolder(info);
                 tempFiles.Completed = tempFiles.Total;
+
+                //Reset the low disk space notifications
+                Shell.LowDiskSpaceNotificationsEnabled = lowDiskSpaceNotifications;
             }