From 23beddb209314d6a6ef20c9e7ca7229ee7a1905b Mon Sep 17 00:00:00 2001
From: lineagedr <lordlo0kk@gmail.com>
Date: Mon, 16 Aug 2021 18:26:31 +0300
Subject: [PATCH] fix(Core/Crash): Fix a crash occurring when shutting the
 server down.

---
 src/server/game/Maps/MapUpdater.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/server/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp
index 0f5b273cf6..c7628df0bb 100644
--- a/src/server/game/Maps/MapUpdater.cpp
+++ b/src/server/game/Maps/MapUpdater.cpp
@@ -67,6 +67,7 @@ MapUpdater::~MapUpdater()
 
 void MapUpdater::activate(size_t num_threads)
 {
+    _workerThreads.reserve(num_threads);
     for (size_t i = 0; i < num_threads; ++i)
     {
         _workerThreads.push_back(std::thread(&MapUpdater::WorkerThread, this));
@@ -83,7 +84,10 @@ void MapUpdater::deactivate()
 
     for (auto& thread : _workerThreads)
     {
-        thread.join();
+        if (thread.joinable())
+        {
+            thread.join();
+        }
     }
 }