From 1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 29 May 2014 12:56:16 +0300
Subject: Move many variables from client into settings.

---
 src/net/ea/loginhandler.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/net/ea/loginhandler.cpp')

diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index c53cdb773..ecc51bfeb 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -25,6 +25,7 @@
 #include "client.h"
 #include "configuration.h"
 #include "logger.h"
+#include "settings.h"
 
 #include "gui/windows/logindialog.h"
 
@@ -85,7 +86,7 @@ void LoginHandler::chooseServer(const unsigned int server,
     if (charServer)
     {
         if (config.getBoolValue("usePersistentIP") || persistentIp)
-            charServer->hostname = client->getServerName();
+            charServer->hostname = settings.serverName;
         else
             charServer->hostname = ipToString(mWorlds[server]->address);
         charServer->port = mWorlds[server]->port;
-- 
cgit v1.2.3-60-g2f50