Build order restart error fixed

nordie92 · Nov 15, 2021 · 70384b1 · 70384b1
1 parent 905c461
commit 70384b1
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/AoE4BO/Overlay.cs b/AoE4BO/Overlay.cs
@@ -27,6 +27,9 @@ public Overlay()
 
         public void StartBuildOrder(BuildOrder buildOrder)
         {
+            if (_thread != null && _thread.ThreadState == System.Threading.ThreadState.Background)
+                StopBuildOrder();
+
             _buildOrder = buildOrder;
 
             // start stopwatch to get draw delta time
@@ -45,6 +48,8 @@ public void StartBuildOrder(BuildOrder buildOrder)
         public void StopBuildOrder()
         {
             _stopDrawThread = true;
+            while (_stopDrawThread)
+                Thread.Sleep(100);
             Global.OverlayState = OverlayState.Idle;
         }
 
@@ -53,8 +58,6 @@ public void RestartBuildOrder()
             if (_buildOrder != null)
             {
                 StopBuildOrder();
-                while (_stopDrawThread)
-                    Thread.Sleep(100);
                 StartBuildOrder(_buildOrder);
             }
         }
@@ -110,10 +113,10 @@ private void DoWork(object state)
                 }
                 finally
                 {
-                    _stopDrawThread = false;
-                    Thread.Sleep(2000);
+                    Thread.Sleep(100);
                 }
             }
+            _stopDrawThread = false;
         }
 
         private void OnTick(object sender, EventArgs e)