From fda20df9abc9cab49644bf76287d5e759e99fbf6 Mon Sep 17 00:00:00 2001
From: Tig <tig@users.noreply.github.com>
Date: Tue, 26 Mar 2024 12:07:08 -0600
Subject: [PATCH] Another attempt to fix Dispose in BWC

---
 UICatalog/Scenarios/BackgroundWorkerCollection.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/UICatalog/Scenarios/BackgroundWorkerCollection.cs b/UICatalog/Scenarios/BackgroundWorkerCollection.cs
index fd537dfb5..e6f51d6f9 100644
--- a/UICatalog/Scenarios/BackgroundWorkerCollection.cs
+++ b/UICatalog/Scenarios/BackgroundWorkerCollection.cs
@@ -115,10 +115,9 @@ public class BackgroundWorkerCollection : Scenario
             if (_workerApp?.Running == false)
             {
                 Application.Run (_workerApp);
-
-                return;
             }
         }
+
         private void Menu_MenuOpening (object sender, MenuOpeningEventArgs menu)
         {
             if (menu.CurrentMenu.Title == "_Window")
@@ -493,6 +492,7 @@ public class BackgroundWorkerCollection : Scenario
             if (stagingUI.Staging != null && stagingUI.Staging.StartStaging != null)
             {
                 staging = new Staging (stagingUI.Staging.StartStaging);
+                stagingUI.Dispose ();
                 WriteLog ($"Worker is started at {staging.StartStaging}.{staging.StartStaging:fff}");
 
                 if (_stagingWorkers == null)
@@ -503,7 +503,10 @@ public class BackgroundWorkerCollection : Scenario
                 _stagingWorkers.Add (staging, worker);
                 worker.RunWorkerAsync ();
             }
-            stagingUI.Dispose ();
+            else
+            {
+                stagingUI.Dispose ();
+            }
         }
 
         public void WriteLog (string msg)