GameLoop.Exit: Don't call Thread.Join on ourselves

OpenDAoC · Aug 4, 2024 · cf92e80 · cf92e80
1 parent 128927b
commit cf92e80
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/GameServer/managers/GameLoopManager/GameLoop.cs b/GameServer/managers/GameLoopManager/GameLoop.cs
@@ -61,8 +61,12 @@ public static void Exit()
             if (_gameLoopThread == null)
                 return;
 
-            _gameLoopThread.Interrupt();
-            _gameLoopThread.Join();
+            if (Thread.CurrentThread != _gameLoopThread)
+            {
+                _gameLoopThread.Interrupt();
+                _gameLoopThread.Join();
+            }
+
             _gameLoopThread = null;
             _busyWaitThresholdThread.Interrupt();
             _busyWaitThresholdThread.Join();