From 85b8449e83832d4d479da9f814c4a7b10c249b94 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 29 Jul 2014 11:17:27 -0700
Subject: [PATCH] use two different signals for settings success and failure

---
 assignment-client/src/audio/AudioMixer.cpp | 3 ++-
 libraries/networking/src/DomainHandler.cpp | 4 ++--
 libraries/networking/src/DomainHandler.h   | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index e2d9636118..4c3d951716 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -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();
     
diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp
index 0f37160512..e316ea2cc5 100644
--- a/libraries/networking/src/DomainHandler.cpp
+++ b/libraries/networking/src/DomainHandler.cpp
@@ -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();
         }        
diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h
index 67edd64172..81745713e7 100644
--- a/libraries/networking/src/DomainHandler.h
+++ b/libraries/networking/src/DomainHandler.h
@@ -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();