Fix a crash after changing servers

Reviewed-by: Chuck Miller

3 files changed, 4 insertions, 2 deletions

diff --git a/src/net/ea/generalhandler.cpp b/src/net/ea/generalhandler.cpp
index 749c2409..6ff4accd 100644
--- a/src/net/ea/generalhandler.cpp
+++ b/src/net/ea/generalhandler.cpp
@@ -180,6 +180,8 @@ void GeneralHandler::reload()
         mNetwork->disconnect();
 
     static_cast<LoginHandler*>(mLoginHandler.get())->clearWorlds();
+    static_cast<CharServerHandler*>(mCharHandler.get())->setCharCreateDialog(0);
+    static_cast<CharServerHandler*>(mCharHandler.get())->setCharSelectDialog(0);
 }
 
 void GeneralHandler::unload()
diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp
index f2f7d33b..6e1639af 100644
--- a/src/net/manaserv/generalhandler.cpp
+++ b/src/net/manaserv/generalhandler.cpp
@@ -122,7 +122,8 @@ void GeneralHandler::load()
 
 void GeneralHandler::reload()
 {
-    // Nothing needed yet
+    static_cast<CharHandler*>(mCharHandler.get())->setCharCreateDialog(0);
+    static_cast<CharHandler*>(mCharHandler.get())->setCharSelectDialog(0);
 }
 
 void GeneralHandler::unload()
diff --git a/src/net/net.cpp b/src/net/net.cpp
index d613f4df..f7ab3897 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -133,7 +133,6 @@ void connectToServer(const ServerInfo &server)
     }
 
     if (networkType == server.type && getGeneralHandler() != NULL)
-    //if (networkType != ServerInfo::UNKNOWN)
     {
         getGeneralHandler()->reload();
     }