summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client.cpp8
-rw-r--r--src/gui/windows/charselectdialog.cpp2
2 files changed, 9 insertions, 1 deletions
diff --git a/src/client.cpp b/src/client.cpp
index ec05a7460..8ab79ae25 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -611,6 +611,9 @@ void Client::gameClear()
if (chatHandler)
chatHandler->clear();
+ if (charServerHandler)
+ charServerHandler->clear();
+
delete2(ipc);
#ifdef USE_MUMBLE
@@ -959,6 +962,11 @@ int Client::gameExec()
if (!settings.options.skipUpdate)
UpdaterWindow::unloadMods(settings.oldUpdates + "/fix/");
}
+ else if (mOldState == STATE_CHAR_SELECT)
+ {
+ if (mState != STATE_CHANGEPASSWORD)
+ charServerHandler->clear();
+ }
mOldState = mState;
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index 9468fa29a..fe644ac00 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -181,7 +181,7 @@ CharSelectDialog::CharSelectDialog(LoginData *const data) :
CharSelectDialog::~CharSelectDialog()
{
- charServerHandler->clear();
+ //charServerHandler->clear();
}
void CharSelectDialog::postInit()