From 46de7ed83bb4f109d8eb4c6f6730efc15180fb17 Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cdonaghey728@gmail.com>
Date: Tue, 9 Jan 2018 08:32:59 +0000
Subject: [PATCH] WL 21666 - Window.domainChanged() isn't emitted if domain
 isn't running

---
 interface/src/scripting/WindowScriptingInterface.cpp | 6 ++++++
 interface/src/scripting/WindowScriptingInterface.h   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp
index 4b355653b6..9b1285723b 100644
--- a/interface/src/scripting/WindowScriptingInterface.cpp
+++ b/interface/src/scripting/WindowScriptingInterface.cpp
@@ -49,6 +49,8 @@ void CustomPromptResultFromScriptValue(const QScriptValue& object, CustomPromptR
 WindowScriptingInterface::WindowScriptingInterface() {
     const DomainHandler& domainHandler = DependencyManager::get<NodeList>()->getDomainHandler();
     connect(&domainHandler, &DomainHandler::connectedToDomain, this, &WindowScriptingInterface::domainChanged);
+    connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, &WindowScriptingInterface::disconnectedFromDomain);
+
     connect(&domainHandler, &DomainHandler::domainConnectionRefused, this, &WindowScriptingInterface::domainConnectionRefused);
 
     connect(qApp, &Application::svoImportRequested, [this](const QString& urlString) {
@@ -134,6 +136,10 @@ void WindowScriptingInterface::promptAsync(const QString& message, const QString
     });
 }
 
+void WindowScriptingInterface::disconnectedFromDomain() {
+    emit domainChanged("");
+}
+
 CustomPromptResult WindowScriptingInterface::customPrompt(const QVariant& config) {
     CustomPromptResult result;
     bool ok = false;
diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h
index d223f95af4..c27940c231 100644
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@@ -83,6 +83,7 @@ public slots:
 
 private slots:
     void onMessageBoxSelected(int button);
+    void disconnectedFromDomain();
 
 signals:
     void domainChanged(const QString& domainHostname);