Core: Fix crash in ~ScriptMgr

Fixes: TrinityCore#854 Fixes: TrinityCore#918 Fixes: TrinityCore#917
rebirth-core · Mar 14, 2011 · 1e773eb · 1e773eb
1 parent 68c09e8
commit 1e773eb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
@@ -140,6 +140,25 @@ ScriptMgr::ScriptMgr()
 }
 
 ScriptMgr::~ScriptMgr()
+{
+}
+
+void ScriptMgr::Initialize()
+{
+    uint32 oldMSTime = getMSTime();
+
+    LoadDatabase();
+
+    sLog->outString("Loading C++ scripts");
+
+    FillSpellSummary();
+    AddScripts();
+
+    sLog->outString(">> Loaded %u C++ scripts in %u ms", GetScriptCount(), GetMSTimeDiffToNow(oldMSTime));
+    sLog->outString();
+}
+
+void ScriptMgr::Unload()
 {
     #define SCR_CLEAR(T) \
         FOR_SCRIPTS(T, itr, end) \
@@ -175,21 +194,6 @@ ScriptMgr::~ScriptMgr()
     #undef SCR_CLEAR
 }
 
-void ScriptMgr::Initialize()
-{
-    uint32 oldMSTime = getMSTime();
-
-    LoadDatabase();
-
-    sLog->outString("Loading C++ scripts");
-
-    FillSpellSummary();
-    AddScripts();
-
-    sLog->outString(">> Loaded %u C++ scripts in %u ms", GetScriptCount(), GetMSTimeDiffToNow(oldMSTime));
-    sLog->outString();
-}
-
 void ScriptMgr::LoadDatabase()
 {
     sScriptSystemMgr->LoadVersion();

diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
@@ -760,7 +760,7 @@ class ScriptMgr
     friend class ScriptObject;
 
     ScriptMgr();
-    ~ScriptMgr();
+    virtual ~ScriptMgr();
 
     uint32 _scriptCount;
 
@@ -775,6 +775,9 @@ class ScriptMgr
         void IncrementScriptCount() { ++_scriptCount; }
         uint32 GetScriptCount() const { return _scriptCount; }
 
+    public: /* Unloading */
+        void Unload();
+
     public: /* SpellScriptLoader */
 
         void CreateSpellScripts(uint32 spell_id, std::list<SpellScript*>& script_vector);

diff --git a/src/server/worldserver/WorldThread/WorldRunnable.cpp b/src/server/worldserver/WorldThread/WorldRunnable.cpp
@@ -92,4 +92,5 @@ void WorldRunnable::run()
 
     sMapMgr->UnloadAll();                     // unload all grids (including locked in memory)
     sObjectAccessor->UnloadAll();             // unload 'i_player2corpse' storage and remove from world
+    sScriptMgr->Unload();
 }