Properly cancel and close all open forms when main form closes

AlexxEG · Aug 22, 2021 · b7dc1ab · b7dc1ab
1 parent 6dc4e42
commit b7dc1ab
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/BSA Browser/BSABrowser.cs b/BSA Browser/BSABrowser.cs
@@ -297,10 +297,13 @@ private void ShowProgressForm_Click(object sender, EventArgs e)
 
             BackgroundWorker bw = new BackgroundWorker();
             bw.WorkerReportsProgress = true;
-            bw.DoWork += delegate
+            bw.DoWork += delegate (object _, DoWorkEventArgs eventArgs)
             {
                 for (int i = 0; i < 10; i++)
                 {
+                    if (eventArgs.Cancel)
+                        break;
+
                     decimal percentage = (decimal)i / 10 * 100;
                     bw.ReportProgress((int)percentage);
                     System.Threading.Thread.Sleep(1000);
@@ -315,6 +318,12 @@ private void ShowProgressForm_Click(object sender, EventArgs e)
                 pf.BlockClose = false;
                 pf.Close();
             };
+
+            pf.Canceled += delegate
+            {
+                bw.CancelAsync();
+            };
+
             bw.RunWorkerAsync();
         }
 
@@ -365,7 +374,14 @@ private void BSABrowser_Load(object sender, EventArgs e)
         private void BSABrowser_FormClosed(object sender, FormClosedEventArgs e)
         {
             // Signal to close all Forms when MainForm closes
-            Application.Exit();
+            for (int i = Application.OpenForms.Count; i-- > 0;)
+            {
+                Form form = Application.OpenForms[i];
+                if (form is ProgressForm)
+                    (form as ProgressForm).ForceCancel();
+                else
+                    form.Close();
+            }
         }
 
         private void BSABrowser_FormClosing(object sender, FormClosingEventArgs e)

diff --git a/BSA Browser/ProgressForm.cs b/BSA Browser/ProgressForm.cs
@@ -124,5 +124,15 @@ private void OnCanceled(EventArgs e)
         {
             Canceled?.Invoke(this, e);
         }
+
+        /// <summary>
+        /// Cancels and closes <see cref="ProgressForm"/>.
+        /// </summary>
+        public void ForceCancel()
+        {
+            OnCanceled(EventArgs.Empty);
+            this.BlockClose = false;
+            this.Close();
+        }
     }
 }