Merge remote-tracking branch 'upstream/master'

4 files changed, 12 insertions, 0 deletions

diff --git a/src/client.cpp b/src/client.cpp
index 02b4dc3af..5e1fca53b 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -568,6 +568,9 @@ Client::~Client()
     NPCDB::unload();
     StatusEffect::unload();
 
+    if (Net::getLoginHandler())
+        Net::getLoginHandler()->clearWorlds();
+
     delete mumbleManager;
     mumbleManager = 0;
 
diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h
index 5566aa087..5607ca1e2 100644
--- a/src/net/loginhandler.h
+++ b/src/net/loginhandler.h
@@ -101,6 +101,8 @@ class LoginHandler
 
         virtual Worlds getWorlds() const = 0;
 
+        virtual void clearWorlds() = 0;
+
         virtual ~LoginHandler ()
         { }
 
diff --git a/src/net/manaserv/loginhandler.cpp b/src/net/manaserv/loginhandler.cpp
index 1edfbb6b6..d9b36d461 100644
--- a/src/net/manaserv/loginhandler.cpp
+++ b/src/net/manaserv/loginhandler.cpp
@@ -481,4 +481,9 @@ void LoginHandler::reconnect()
     accountServerConnection->send(msg);
 }
 
+void LoginHandler::clearWorlds()
+{
+
+}
+
 } // namespace ManaServ
diff --git a/src/net/manaserv/loginhandler.h b/src/net/manaserv/loginhandler.h
index 289116696..a13bbb33e 100644
--- a/src/net/manaserv/loginhandler.h
+++ b/src/net/manaserv/loginhandler.h
@@ -84,6 +84,8 @@ class LoginHandler : public MessageHandler, public Net::LoginHandler
 
         void reconnect();
 
+        void clearWorlds();
+
     private:
         void handleLoginResponse(Net::MessageIn &msg);
         void handleRegisterResponse(Net::MessageIn &msg);