Skip to content

Commit 42e4319

Browse files
committed
Fix weird crash in world when no mmaps are found
1 parent 5c9e15b commit 42e4319

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/game/World/World.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,10 @@ World::~World()
161161
VMAP::VMapFactory::clear();
162162
MMAP::MMapFactory::clear();
163163

164-
m_lfgQueueThread.join();
165-
m_bgQueueThread.join();
164+
if (m_lfgQueueThread.joinable())
165+
m_lfgQueueThread.join();
166+
if (m_bgQueueThread.joinable())
167+
m_bgQueueThread.join();
166168
}
167169

168170
/// Cleanups before world stop

0 commit comments

Comments
 (0)