From dce92611f3ff33e7db0a7234d611f5bffb0cc45f Mon Sep 17 00:00:00 2001
From: leak <leak@bitmx.net>
Date: Sun, 20 Jul 2014 00:39:43 +0200
Subject: Refactored singletons to enable proper deconstruction during shutdown

---
 src/server/game/Scripting/ScriptMgr.h    | 4 ++--
 src/server/game/Scripting/ScriptSystem.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/server/game/Scripting')

diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 260c43f9b3b..325a0743d79 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -881,8 +881,8 @@ class ScriptMgr
     public: /* Initialization */
         static ScriptMgr* instance()
         {
-            static ScriptMgr* instance = new ScriptMgr();
-            return instance;
+            static ScriptMgr instance;
+            return &instance;
         }
 
         void Initialize();
diff --git a/src/server/game/Scripting/ScriptSystem.h b/src/server/game/Scripting/ScriptSystem.h
index 636343838c1..74c51e5b136 100644
--- a/src/server/game/Scripting/ScriptSystem.h
+++ b/src/server/game/Scripting/ScriptSystem.h
@@ -54,8 +54,8 @@ class SystemMgr
     public:
         static SystemMgr* instance()
         {
-            static SystemMgr* instance = new SystemMgr();
-            return instance;
+            static SystemMgr instance;
+            return &instance;
         }
 
         typedef std::unordered_map<uint32, ScriptPointVector> PointMoveMap;
-- 
cgit v1.2.3