Prevents run stagingUI if OverlappedTop is null.

gui-cs · Mar 25, 2024 · 155e0a4 · 155e0a4
1 parent feed69d
commit 155e0a4
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/UICatalog/Scenarios/BackgroundWorkerCollection.cs b/UICatalog/Scenarios/BackgroundWorkerCollection.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Threading;
 using Terminal.Gui;
 
@@ -19,6 +20,10 @@ public override void Init ()
 
         //main.Dispose ();
         Application.Top.Dispose ();
+
+#if DEBUG_IDISPOSABLE
+        Debug.Assert (Application.OverlappedChildren.Count == 0);
+#endif
     }
 
     public override void Run () { }
@@ -357,6 +362,12 @@ public WorkerApp ()
             Add (_listLog);
 
             Closing += WorkerApp_Closing;
+            Closed += WorkerApp_Closed;
+        }
+
+        private void WorkerApp_Closed (object sender, ToplevelEventArgs e)
+        {
+            CancelWorker ();
         }
         private void WorkerApp_Closing (object sender, ToplevelClosingEventArgs e)
         {
@@ -475,7 +486,13 @@ public void RunWorker ()
 
                                                  _stagingsUi.Add (stagingUI);
                                                  _stagingWorkers.Remove (staging);
-
+#if DEBUG_IDISPOSABLE
+                                                 if (Application.OverlappedTop is null)
+                                                 {
+                                                     stagingUI.Dispose ();
+                                                     return;
+                                                 }
+#endif
                                                  Application.Run (stagingUI);
                                                  stagingUI.Dispose ();
                                              }