From 30e9d57026269a041377d8602884aa42318ae380 Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Tue, 11 Sep 2018 18:52:28 -0700
Subject: [PATCH] adding pattern for during timeout to put into error state

---
 interface/src/ConnectionMonitor.cpp                  | 5 +++--
 interface/src/ConnectionMonitor.h                    | 4 ++++
 interface/src/octree/OctreePacketProcessor.h         | 2 +-
 interface/src/scripting/WindowScriptingInterface.cpp | 3 ---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/interface/src/ConnectionMonitor.cpp b/interface/src/ConnectionMonitor.cpp
index 3fc353ec01..3c85cfb339 100644
--- a/interface/src/ConnectionMonitor.cpp
+++ b/interface/src/ConnectionMonitor.cpp
@@ -33,16 +33,17 @@ void ConnectionMonitor::init() {
     connect(&domainHandler, &DomainHandler::connectedToDomain, this, &ConnectionMonitor::stopTimer);
     connect(&domainHandler, &DomainHandler::domainConnectionRefused, this, &ConnectionMonitor::stopTimer);
     connect(&domainHandler, &DomainHandler::redirectToErrorDomainURL, this, &ConnectionMonitor::stopTimer);
+    connect(this, &ConnectionMonitor::setRedirectErrorState, &domainHandler, &DomainHandler::setRedirectErrorState);
 
     _timer.setSingleShot(true);
     if (!domainHandler.isConnected()) {
         _timer.start(ON_INITIAL_LOAD_REDIRECT_AFTER_DISCONNECTED_FOR_X_MS);
     }
 
-    connect(&_timer, &QTimer::timeout, this, [domainHandler]() {
+    connect(&_timer, &QTimer::timeout, this, [this]() {
         qDebug() << "ConnectionMonitor: Redirecting to 404 error domain";
         // set in a timeout error
-        domainHandler.setErrorRedirectState(REDIRECT_HIFI_ADDRESS, 5);
+        emit setRedirectErrorState(REDIRECT_HIFI_ADDRESS, 5);
     });
 }
 
diff --git a/interface/src/ConnectionMonitor.h b/interface/src/ConnectionMonitor.h
index e3d393163b..5e75e2618b 100644
--- a/interface/src/ConnectionMonitor.h
+++ b/interface/src/ConnectionMonitor.h
@@ -15,6 +15,7 @@
 #include <QObject>
 #include <QTimer>
 
+class QUrl;
 class QString;
 
 class ConnectionMonitor : public QObject {
@@ -22,6 +23,9 @@ class ConnectionMonitor : public QObject {
 public:
     void init();
 
+signals:
+    void setRedirectErrorState(QUrl errorURL, int reasonCode);
+
 private slots:
     void startTimer();
     void stopTimer();
diff --git a/interface/src/octree/OctreePacketProcessor.h b/interface/src/octree/OctreePacketProcessor.h
index de26dbc3d2..d6ffb942e6 100644
--- a/interface/src/octree/OctreePacketProcessor.h
+++ b/interface/src/octree/OctreePacketProcessor.h
@@ -27,7 +27,7 @@ public:
 
     void startEntitySequence();
     bool isLoadSequenceComplete() const { return _safeLanding->isLoadSequenceComplete(); }
-    float domainLoadingProgress() { return _safeLanding->loadingProgressPercentage(); }
+    float domainLoadingProgress() const { return _safeLanding->loadingProgressPercentage(); }
 
 signals:
     void packetVersionMismatch();
diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp
index c217658c62..b4bfddd334 100644
--- a/interface/src/scripting/WindowScriptingInterface.cpp
+++ b/interface/src/scripting/WindowScriptingInterface.cpp
@@ -39,9 +39,6 @@ WindowScriptingInterface::WindowScriptingInterface() {
     connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, &WindowScriptingInterface::disconnectedFromDomain);
 
     connect(&domainHandler, &DomainHandler::domainConnectionRefused, this, &WindowScriptingInterface::domainConnectionRefused);
-    connect(&domainHandler, &DomainHandler::domainConnectionErrorChanged, this, [this](int reasonCode) {
-            _lastDomainConnectionError = reasonCode;
-        });
 
     connect(qApp, &Application::svoImportRequested, [this](const QString& urlString) {
         static const QMetaMethod svoImportRequestedSignal =