From ef9bb85f8aaf946f5cf2417b42f070cd2c53b793 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 3 Jul 2014 11:16:01 -0700 Subject: [PATCH 1/2] fix so domain-server doesn't open missing config file --- domain-server/src/DomainServerSettingsManager.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp index d7e2e05ca8..f9996aa0e7 100644 --- a/domain-server/src/DomainServerSettingsManager.cpp +++ b/domain-server/src/DomainServerSettingsManager.cpp @@ -36,9 +36,12 @@ DomainServerSettingsManager::DomainServerSettingsManager() : // load the existing config file to get the current values QFile configFile(QCoreApplication::applicationDirPath() + SETTINGS_CONFIG_FILE_RELATIVE_PATH); - configFile.open(QIODevice::ReadOnly); - _settingsMap = QJsonDocument::fromJson(configFile.readAll()).toVariant().toMap(); + if (configFile.exists()) { + configFile.open(QIODevice::ReadOnly); + + _settingsMap = QJsonDocument::fromJson(configFile.readAll()).toVariant().toMap(); + } } const QString DESCRIPTION_SETTINGS_KEY = "settings"; From 411733feb72c9dd4c00fb20f3948784a9b1604eb Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 3 Jul 2014 11:34:39 -0700 Subject: [PATCH 2/2] make sure NetworkAccessManager singleton is on main AC thread --- assignment-client/src/AssignmentClient.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp index da1feda7a0..f7594e97f2 100644 --- a/assignment-client/src/AssignmentClient.cpp +++ b/assignment-client/src/AssignmentClient.cpp @@ -104,6 +104,8 @@ AssignmentClient::AssignmentClient(int &argc, char **argv) : // connections to AccountManager for authentication connect(&AccountManager::getInstance(), &AccountManager::authRequired, this, &AssignmentClient::handleAuthenticationRequest); + + NetworkAccessManager::getInstance(); } void AssignmentClient::sendAssignmentRequest() {