aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--networkmanager.cpp5
-rw-r--r--networkmanager.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/networkmanager.cpp b/networkmanager.cpp
index 8afe087c..e7246fe3 100644
--- a/networkmanager.cpp
+++ b/networkmanager.cpp
@@ -20,6 +20,11 @@ NetworkManager::NetworkManager(AOApplication *parent) : QObject(parent)
QObject::connect(ms_socket, SIGNAL(readyRead()), this, SLOT(handle_ms_packet()));
QObject::connect(server_socket, SIGNAL(readyRead()), this, SLOT(handle_server_packet()));
QObject::connect(server_socket, SIGNAL(disconnected()), ao_app, SLOT(server_disconnected()));
+
+ QString master_config = ao_app->read_config("master");
+ if (master_config != "") {
+ ms_nosrv_hostname = master_config;
+ }
}
NetworkManager::~NetworkManager()
diff --git a/networkmanager.h b/networkmanager.h
index ca47c402..99987f3b 100644
--- a/networkmanager.h
+++ b/networkmanager.h
@@ -38,9 +38,9 @@ public:
const QString ms_srv_hostname = "_aoms._tcp.aceattorneyonline.com";
#ifdef LOCAL_MS
- const QString ms_nosrv_hostname = "localhost";
+ QString ms_nosrv_hostname = "localhost";
#else
- const QString ms_nosrv_hostname = "master.aceattorneyonline.com";
+ QString ms_nosrv_hostname = "master.aceattorneyonline.com";
#endif
const int ms_port = 27016;