From 380f24b37fca1c6f6df24fb37fffb9d8b5062f04 Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Thu, 13 Sep 2018 11:53:21 -0700
Subject: [PATCH] adding fix, changing window title

---
 interface/src/Application.cpp               | 11 +++++++++--
 libraries/networking/src/AddressManager.cpp |  1 -
 libraries/networking/src/DomainHandler.cpp  |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 77e2cb3211..889d3ce9c6 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6346,6 +6346,8 @@ void Application::updateWindowTitle() const {
 
     auto nodeList = DependencyManager::get<NodeList>();
     auto accountManager = DependencyManager::get<AccountManager>();
+    auto isInErrorState = nodeList->getDomainHandler().isInErrorState();
+    auto isConnected = nodeList->getDomainHandler().isConnected();
 
     QString buildVersion = " - "
         + (BuildInfo::BUILD_TYPE == BuildInfo::BuildType::Stable ? QString("Version") : QString("Build"))
@@ -6353,14 +6355,19 @@ void Application::updateWindowTitle() const {
 
     QString loginStatus = accountManager->isLoggedIn() ? "" : " (NOT LOGGED IN)";
 
-    QString connectionStatus = nodeList->getDomainHandler().isConnected() ? "" : " (NOT CONNECTED)";
+    QString connectionStatus = isInErrorState ? " (ERROR CONNECTING)" :
+        nodeList->getDomainHandler().isConnected() ? "" : " (NOT CONNECTED)";
     QString username = accountManager->getAccountInfo().getUsername();
 
     setCrashAnnotation("username", username.toStdString());
 
     QString currentPlaceName;
     if (isServerlessMode()) {
-        currentPlaceName = "serverless: " + DependencyManager::get<AddressManager>()->getDomainURL().toString();
+        if (isInErrorState) {
+            currentPlaceName = "serverless: " + nodeList->getDomainHandler().getErrorDomainURL().toString();
+        } else {
+            currentPlaceName = "serverless: " + DependencyManager::get<AddressManager>()->getDomainURL().toString();
+        }
     } else {
         currentPlaceName = DependencyManager::get<AddressManager>()->getDomainURL().host();
         if (currentPlaceName.isEmpty()) {
diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index ebb4e325e3..8085039b02 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -269,7 +269,6 @@ bool AddressManager::handleUrl(const QUrl& lookupUrl, LookupTrigger trigger) {
                 // save the last visited domain URL.
                 _lastVisitedURL = lookupUrl;
 
-                auto lastVisitedURLStr = lookupUrl.toString().toStdString();
                 // a network address lookup clears the previous lookup since we don't expect to re-attempt it
                 _previousAPILookup.clear();
 
diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp
index c20a7057f8..3dec310ffc 100644
--- a/libraries/networking/src/DomainHandler.cpp
+++ b/libraries/networking/src/DomainHandler.cpp
@@ -112,7 +112,6 @@ void DomainHandler::softReset() {
     if (!_isInErrorState) {
         QMetaObject::invokeMethod(&_apiRefreshTimer, "start");
     }
-    _isInErrorState = false;
 }
 
 void DomainHandler::hardReset() {
@@ -121,6 +120,7 @@ void DomainHandler::hardReset() {
     }
 
     softReset();
+    _isInErrorState = false;
 
     qCDebug(networking) << "Hard reset in NodeList DomainHandler.";
     _pendingDomainID = QUuid();