ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

fix(Core/Maps): prevet a crash occurring when shutting the server down. (#7387)

Browse source
This commit is contained in:
lineagedr 2021-08-20 01:01:48 +03:00 • committed by GitHub
parent 6693bf703c
commit ff7d6d2dae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/server/game/Maps/MapUpdater.cpp
View file

@ -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();
}
}
}