From 71dd90d37461d1882f0e4d45749ff458fd97a78c Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 9 Sep 2011 01:24:29 +0300
Subject: Fix guild manager initialisation if switching between servers.

---
 src/guildmanager.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/guildmanager.cpp')

diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp
index 7bc0444ed..eaee529b9 100644
--- a/src/guildmanager.cpp
+++ b/src/guildmanager.cpp
@@ -57,9 +57,6 @@ GuildManager::~GuildManager()
 
 void GuildManager::init()
 {
-    if (guildManager)
-        return;
-
     int val = serverConfig.getValue("enableGuildBot", -1);
     if (val == -1)
     {
@@ -71,7 +68,17 @@ void GuildManager::init()
     }
     mEnableGuildBot = val;
     if (mEnableGuildBot)
-        guildManager = new GuildManager();
+    {
+        if (!guildManager)
+            guildManager = new GuildManager();
+        else
+            guildManager->reload();
+    }
+    else if (guildManager)
+    {
+        delete guildManager;
+        guildManager = 0;
+    }
 }
 
 void GuildManager::reload()
-- 
cgit v1.2.3-60-g2f50