Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:24:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

use two different signals for settings success and failure

Browse source
This commit is contained in:
Stephen Birarda 2014-07-29 11:17:27 -07:00
parent 9a7267a10c
commit 85b8449e83
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
assignment-client/src/audio/AudioMixer.cpp
View file

@ -415,7 +415,8 @@ void AudioMixer::run() {
// block until we get the settingsRequestComplete signal
QEventLoop loop;
connect(&domainHandler, &DomainHandler::settingsRequestComplete, &loop, &QEventLoop::quit);
connect(&domainHandler, &DomainHandler::settingsReceived, &loop, &QEventLoop::quit);
connect(&domainHandler, &DomainHandler::settingsReceiveFail, &loop, &QEventLoop::quit);
domainHandler.requestDomainSettings();
loop.exec();

4
libraries/networking/src/DomainHandler.cpp
View file

@ -157,7 +157,7 @@ void DomainHandler::settingsRequestFinished() {
_settingsObject = QJsonDocument::fromJson(settingsReply->readAll()).object();
qDebug() << "Received domain settings.";
emit settingsRequestComplete(true);
emit settingsReceived();
// reset failed settings requests to 0, we got them
_failedSettingsRequests = 0;
@ -170,7 +170,7 @@ void DomainHandler::settingsRequestFinished() {
qDebug() << "Failed to retreive domain-server settings" << MAX_SETTINGS_REQUEST_FAILED_ATTEMPTS << "times. Re-setting connection to domain.";
clearSettings();
clearConnectionInfo();
emit settingsRequestComplete(false);
emit settingsReceiveFail();
} else {
requestDomainSettings();
}

3
libraries/networking/src/DomainHandler.h
View file

@ -69,7 +69,8 @@ signals:
void hostnameChanged(const QString& hostname);
void connectedToDomain(const QString& hostname);
void settingsRequestComplete(bool wasSuccessful);
void settingsReceived();
void settingsReceiveFail();
private:
void reset();