more cancel checks

n00mkrad · Aug 22, 2021 · 7a191d8 · 7a191d8
1 parent 5c4fcd0
commit 7a191d8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Code/Main/PostProcessingQueue.cs b/Code/Main/PostProcessingQueue.cs
@@ -79,7 +79,7 @@ public static async Task ProcessQueue ()
         {
             Stopwatch sw = new Stopwatch();
 
-            while (run || AnyFilesLeft())
+            while (!Program.canceled && (run || AnyFilesLeft()))
             {
                 if (outputFileQueue.Count > 0)
                 {

diff --git a/Code/Main/Upscale.cs b/Code/Main/Upscale.cs
@@ -166,6 +166,8 @@ public static ModelData GetModelData()
 
         public static string FilenamePostprocess(string file)
         {
+            if (Program.canceled) return null;
+
             try
             {
                 string newFilename = file;

diff --git a/Code/UI/PreviewUI.cs b/Code/UI/PreviewUI.cs
@@ -80,9 +80,8 @@ public static async Task UpscaleImage()
             try
             {
                 await Upscale.Run(Paths.imgInPath, Paths.imgOutPath, mdl, false, Config.GetBool("alpha"), PreviewUi.PreviewMode.None);
-
+                if (Program.canceled) return;
                 outImg = Upscale.GetOutputImg();
-
                 Program.mainForm.SetProgress(100f, "Post-Processing...");
                 await Task.Delay(50);
                 await PostProcessing.PostprocessingSingle(outImg, false);
-Original file line number
+Diff line change
@@ Expand Up / @@ -166,6 +166,8 @@ public static ModelData GetModelData() @@
             public static string FilenamePostprocess(string file)
             {
+                if (Program.canceled) return null;
                 try
                 {
                     string newFilename = file;
@@ Expand Down @@