Fix for #362

TV-Rename · Mar 19, 2018 · e6d8488 · e6d8488
1 parent 0fe036b
commit e6d8488
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/TVRename#/ItemsAndActions/ActionCopyMoveRename.cs b/TVRename#/ItemsAndActions/ActionCopyMoveRename.cs
@@ -124,10 +124,19 @@ public override bool Go(ref bool pause, TVRenameStats stats)
                 // ignored
             }
 
-            if (Operation == Op.Move && _tidyup != null && _tidyup.DeleteEmpty)
+            try
             {
-                logger.Info($"Testing {From.Directory.FullName } to see whether it should be tidied up");
-                DoTidyup(From.Directory  );
+                if (Operation == Op.Move && _tidyup != null && _tidyup.DeleteEmpty)
+                {
+                    logger.Info($"Testing {From.Directory.FullName} to see whether it should be tidied up");
+                    DoTidyup(From.Directory);
+                }
+            }
+            catch (Exception e)
+            {
+                Done = true;
+                Error = true;
+                ErrorText = e.Message;
             }
 
             return !Error;

diff --git a/TVRename#/ItemsAndActions/ActionItem.cs b/TVRename#/ItemsAndActions/ActionItem.cs
@@ -132,7 +132,7 @@ protected void DeleteOrRecycleFolder(DirectoryInfo di)
             else
             {
                 logger.Info($"Deleting {di.FullName}");
-                di.Delete();
+                di.Delete(true,true);
             }
         }
 

diff --git a/TVRename#/TVRename/TVDoc.cs b/TVRename#/TVRename/TVDoc.cs
@@ -1698,6 +1698,9 @@ public void ActionProcessor(Object queuesIn)
             catch (Exception e)
             {
                 logger.Fatal(e,"Unhandled Exception in ActionProcessor");
+                foreach (Thread t in this.ActionWorkers)
+                    t.Abort();
+                this.WaitForAllActionThreadsAndTidyUp();
                 return;
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -132,7 +132,7 @@ protected void DeleteOrRecycleFolder(DirectoryInfo di) @@
                 else
                 {
                     logger.Info($"Deleting {di.FullName}");
-                    di.Delete();
+                    di.Delete(true,true);
                 }
             }
@@ Expand Down @@