From adae511e08f2c473f738bbd00987fc3a1aad0123 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sat, 3 Apr 2010 17:40:00 -0600 Subject: Fix a crash after changing servers Reviewed-by: Chuck Miller --- src/net/ea/generalhandler.cpp | 2 ++ src/net/manaserv/generalhandler.cpp | 3 ++- src/net/net.cpp | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') 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(mLoginHandler.get())->clearWorlds(); + static_cast(mCharHandler.get())->setCharCreateDialog(0); + static_cast(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(mCharHandler.get())->setCharCreateDialog(0); + static_cast(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(); } -- cgit v1.2.3-60-g2f50