cleanup error handling

n00mkrad · Oct 21, 2020 · 068f362 · 068f362
1 parent eb8036a
commit 068f362
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/Code/Main/MainForm.cs b/Code/Main/MainForm.cs
@@ -454,8 +454,7 @@ public void AfterFirstUpscale ()
 
         private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
         {
-            try { Program.Cleanup(); }
-			catch { }                       // This is fine if it fails due to locks, runs on startup anyway.
+            Program.Cleanup();
 		}
 
 		public void SetHasPreview (bool state)

diff --git a/Code/Main/Program.cs b/Code/Main/Program.cs
@@ -54,16 +54,23 @@ public static MsgBox ShowMessage (string msg, string title = "Message")
 
 		public static void Cleanup ()
         {
-			IOUtils.ClearDir(Paths.previewPath);
-			IOUtils.ClearDir(Paths.previewOutPath);
-			IOUtils.ClearDir(Paths.clipboardFolderPath);
-			IOUtils.ClearDir(Paths.imgInPath);
-			IOUtils.ClearDir(Paths.imgOutPath);
-			IOUtils.ClearDir(Paths.imgOutNcnnPath);
-			IOUtils.ClearDir(Paths.tempImgPath.GetParentDir());
-			IOUtils.ClearDir(Path.Combine(IOUtils.GetAppDataDir(), "giftemp"));
-			IOUtils.DeleteIfExists(Path.Combine(Paths.presetsPath, "lastUsed"));
-			IOUtils.ClearDir(Paths.compositionOut);
+            try
+            {
+				IOUtils.ClearDir(Paths.previewPath);
+				IOUtils.ClearDir(Paths.previewOutPath);
+				IOUtils.ClearDir(Paths.clipboardFolderPath);
+				IOUtils.ClearDir(Paths.imgInPath);
+				IOUtils.ClearDir(Paths.imgOutPath);
+				IOUtils.ClearDir(Paths.imgOutNcnnPath);
+				IOUtils.ClearDir(Paths.tempImgPath.GetParentDir());
+				IOUtils.ClearDir(Path.Combine(IOUtils.GetAppDataDir(), "giftemp"));
+				IOUtils.DeleteIfExists(Path.Combine(Paths.presetsPath, "lastUsed"));
+				IOUtils.ClearDir(Paths.compositionOut);
+			}
+			catch (Exception e)
+            {
+				Logger.Log("Error during cleanup: " + e.Message);
+            }
 		}
 
 		public static void CloseTempForms ()