aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps/MapUpdater.cpp
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2014-07-02 18:38:22 -0500
committerSubv <subv2112@gmail.com>2014-07-02 18:38:22 -0500
commit15352a9302d3204be055748e6188318df1fef0ee (patch)
tree5225de7712bc90b6ab25a953fbbd578da06bfff3 /src/server/game/Maps/MapUpdater.cpp
parentbdc42f663ea2ba715a43c7f65f8d88a1df188e9d (diff)
Fixed an uninitialized value that made the MapUpdater worker threads exit on launch
Diffstat (limited to 'src/server/game/Maps/MapUpdater.cpp')
-rw-r--r--src/server/game/Maps/MapUpdater.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp
index 4ab95d87d48..0a007b3484e 100644
--- a/src/server/game/Maps/MapUpdater.cpp
+++ b/src/server/game/Maps/MapUpdater.cpp
@@ -45,7 +45,7 @@ class MapUpdateRequest
}
};
-MapUpdater::MapUpdater(): pending_requests(0) { }
+MapUpdater::MapUpdater() : pending_requests(0), _cancelationToken(false) {}
MapUpdater::~MapUpdater()
{
@@ -62,6 +62,8 @@ void MapUpdater::activate(size_t num_threads)
void MapUpdater::deactivate()
{
+ _cancelationToken = true;
+
wait();
_queue.Cancel();