Fix weird crash in world when no mmaps are found

cmangos · Feb 1, 2025 · 42e4319 · 42e4319 · al3xc1985 · Feb 1, 2025
1 parent 5c9e15b
commit 42e4319
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/game/World/World.cpp b/src/game/World/World.cpp
@@ -161,8 +161,10 @@ World::~World()
     VMAP::VMapFactory::clear();
     MMAP::MMapFactory::clear();
 
-    m_lfgQueueThread.join();
-    m_bgQueueThread.join();
+    if (m_lfgQueueThread.joinable())
+        m_lfgQueueThread.join();
+    if (m_bgQueueThread.joinable())
+        m_bgQueueThread.join();
 }
 
 /// Cleanups before world stop