Moved cancellation to the begin of the loop.

ErmacMKIII · May 23, 2023 · c85cc54 · c85cc54
1 parent 2fc11bb
commit c85cc54
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/FOnlineScalex.cs b/FOnlineScalex.cs
@@ -108,6 +108,14 @@ public void DoWork(string inDir, string outDir, bool recursive, double eqDiff,
                     string outFile = string.Empty;
                     foreach (string srcFile in fileArray)
                     {
+                        // can be cancelled externally
+                        if (Cancelled && OnCancel != null)
+                        {
+                            OnCancel();
+                            logger.Log("FOnlineScalex cancelled by user!");
+                            break;
+                        }
+
                         // if it's png or FRM file
                         // get extensionless filename
                         // string extLessFilename = Regex.Replace(srcFile, "[.][^.]+$", string.Empty);
@@ -277,15 +285,7 @@ public void DoWork(string inDir, string outDir, bool recursive, double eqDiff,
                         //    ProcessingFile = outFile;
                         //    Frame = dstFrames?.FirstOrDefault();
                         //    OnProgressUpdate((int)Math.Floor(Progress), outFile, dstFrames?.FirstOrDefault());
-                        //}
-
-                        // can be cancelled externally
-                        if (Cancelled && OnCancel != null)
-                        {
-                            OnCancel();
-                            logger.Log("FOnlineScalex cancelled by user!");
-                            break;
-                        }
+                        //}                        
 
                     }
 

diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs
diff --git a/MainForm.cs b/MainForm.cs
@@ -171,7 +171,7 @@ private void InitToolTip()
             toolTip.SetToolTip(this.cboxScale, "Checked - scale image, Unchecked - original size.");
 
             toolTip.SetToolTip(this.btnGo, "Commence processing");
-            toolTip.SetToolTip(this.btnStop, "Interrupt processing");
+            toolTip.SetToolTip(this.btnStop, "Cancel processing");
 
             toolTip.SetToolTip(this.tboxCurrProc, "Currently processing file");
             toolTip.SetToolTip(this.progBar, "Progress of the processing");
@@ -335,7 +335,7 @@ private void howToUseToolStripMenuItem_Click(object sender, EventArgs e)
             sb.Append("8) GO Let the app go.\n");
             sb.Append("\n");
             sb.Append("9) STOPS stops the app.\n");
-            sb.Append("(App can be interrupted anytime during it's processing)\n");
+            sb.Append("(App can be cancelled anytime during it's processing)\n");
             MessageBox.Show(sb.ToString(), "How To Use", MessageBoxButtons.OK, MessageBoxIcon.Information);
         }