From c175949a70a621a246df04a7824267a59299136b Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 9 Apr 2016 21:05:11 +0300
Subject: Show player login in window title.

---
 src/client.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/client.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index ccc64b30f..c027aae9e 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -775,7 +775,6 @@ void Client::stateConnectServer1()
         settings.persistentIp = mCurrentServer.persistentIp;
         settings.supportUrl = mCurrentServer.supportUrl;
         settings.updateMirrors = mCurrentServer.updateMirrors;
-        WindowManager::updateTitle();
 
         if (settings.options.username.empty())
         {
@@ -788,6 +787,8 @@ void Client::stateConnectServer1()
         {
             loginData.username = settings.options.username;
         }
+        settings.login = loginData.username;
+        WindowManager::updateTitle();
 
         loginData.remember = serverConfig.getValue("remember", 1);
         Net::connectToServer(mCurrentServer);
@@ -1086,7 +1087,7 @@ int Client::gameExec()
                     CREATEWIDGETV(mCurrentDialog, ConnectionDialog,
                         // TRANSLATORS: connection dialog header
                         _("Connecting to server"),
-                    State::SWITCH_SERVER);
+                        State::SWITCH_SERVER);
                     TranslationManager::loadCurrentLang();
                     BLOCK_END("Client::gameExec State::CONNECT_SERVER")
                     break;
@@ -1619,6 +1620,7 @@ int Client::gameExec()
                         gameHandler->clear();
                     }
                     settings.serverName.clear();
+                    settings.login.clear();
                     WindowManager::updateTitle();
                     serverConfig.write();
                     serverConfig.unload();
@@ -1643,6 +1645,8 @@ int Client::gameExec()
                     if (loginHandler)
                         loginHandler->connect();
 
+                    settings.login.clear();
+                    WindowManager::updateTitle();
                     mState = State::LOGIN;
                     BLOCK_END("Client::gameExec State::SWITCH_LOGIN")
                     break;
@@ -1655,6 +1659,8 @@ int Client::gameExec()
                     if (gameHandler)
                         gameHandler->disconnect();
 
+                    settings.login.clear();
+                    WindowManager::updateTitle();
                     mState = State::GET_CHARACTERS;
                     BLOCK_END("Client::gameExec State::SWITCH_CHARACTER")
                     break;
-- 
cgit v1.2.3-60-g2f50