From 68dfa81376382b4bdc8407e5334ab1787dc39c3f Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 15 Apr 2015 12:53:52 +0300
Subject: fix missing characters in list after password change selection.

---
 src/client.cpp                       | 8 ++++++++
 src/gui/windows/charselectdialog.cpp | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'src')

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()
-- 
cgit v1.2.3-70-g09d2