From fd47c3e06c7988de48166c5626e07dcca72bd930 Mon Sep 17 00:00:00 2001
From: leak <leak@bitmx.net>
Date: Sun, 20 Jul 2014 14:39:04 +0200
Subject: Prevent duplicate call to MapUpdater::deactivate causing a crash on
 shutdown

---
 src/server/game/Maps/MapUpdater.cpp | 7 -------
 src/server/game/Maps/MapUpdater.h   | 4 ++--
 2 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'src/server')

diff --git a/src/server/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp
index c456f57bd20..69f0bdff885 100644
--- a/src/server/game/Maps/MapUpdater.cpp
+++ b/src/server/game/Maps/MapUpdater.cpp
@@ -45,13 +45,6 @@ class MapUpdateRequest
         }
 };
 
-MapUpdater::MapUpdater() : _cancelationToken(false), pending_requests(0) {}
-
-MapUpdater::~MapUpdater()
-{
-    deactivate();
-}
-
 void MapUpdater::activate(size_t num_threads)
 {
     for (size_t i = 0; i < num_threads; ++i)
diff --git a/src/server/game/Maps/MapUpdater.h b/src/server/game/Maps/MapUpdater.h
index c499110173e..dca20bcf353 100644
--- a/src/server/game/Maps/MapUpdater.h
+++ b/src/server/game/Maps/MapUpdater.h
@@ -32,8 +32,8 @@ class MapUpdater
 {
     public:
 
-        MapUpdater();
-        virtual ~MapUpdater();
+        MapUpdater::MapUpdater() : _cancelationToken(false), pending_requests(0) {}
+        ~MapUpdater() { };
 
         friend class MapUpdateRequest;
 
-- 
cgit v1.2.3