Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 14:29:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #3120 from birarda/network-fix

Browse source 
make sure NetworkAccessManager singleton is on main AC thread
This commit is contained in:
Clément Brisset 2014-07-03 11:35:36 -07:00
commit 6109b7201a
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/AssignmentClient.cpp
View file

@ -104,6 +104,8 @@ AssignmentClient::AssignmentClient(int &argc, char **argv) :
// connections to AccountManager for authentication // connections to AccountManager for authentication
connect(&AccountManager::getInstance(), &AccountManager::authRequired, connect(&AccountManager::getInstance(), &AccountManager::authRequired,
this, &AssignmentClient::handleAuthenticationRequest); this, &AssignmentClient::handleAuthenticationRequest);
NetworkAccessManager::getInstance();
} }
void AssignmentClient::sendAssignmentRequest() { void AssignmentClient::sendAssignmentRequest() {

7
domain-server/src/DomainServerSettingsManager.cpp
View file

@ -36,9 +36,12 @@ DomainServerSettingsManager::DomainServerSettingsManager() :
// load the existing config file to get the current values // load the existing config file to get the current values
QFile configFile(QCoreApplication::applicationDirPath() + SETTINGS_CONFIG_FILE_RELATIVE_PATH); 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"; const QString DESCRIPTION_SETTINGS_KEY = "settings";