diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2018-12-15 11:02:12 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-15 11:02:12 -0600 |
| commit | de6877409714417c8fb29d66d1ae1ef098b82644 (patch) | |
| tree | db79ef284b2223daa1bee48056a96a81310945bf /networkmanager.cpp | |
| parent | 3ef743da7b8071e0dc4b1189cbe131f65f11b5de (diff) | |
| parent | 6d1ea9d81fc02fbc481d93af549003db954aa1f7 (diff) | |
Merge pull request #33 from AttorneyOnline/mega-merge
AOV/Case Cafe feature parity
Diffstat (limited to 'networkmanager.cpp')
| -rw-r--r-- | networkmanager.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/networkmanager.cpp b/networkmanager.cpp index e7246fe3..288a9007 100644 --- a/networkmanager.cpp +++ b/networkmanager.cpp @@ -4,8 +4,6 @@ #include "debug_functions.h" #include "lobby.h" -#include <cstring> - NetworkManager::NetworkManager(AOApplication *parent) : QObject(parent) { ao_app = parent; @@ -21,10 +19,9 @@ NetworkManager::NetworkManager(AOApplication *parent) : QObject(parent) 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 != "") { + QString master_config = ao_app->configini->value("master", "").value<QString>(); + if (master_config != "") ms_nosrv_hostname = master_config; - } } NetworkManager::~NetworkManager() |