From 3f5ed4bef8603eae9bb4a08e9912953057244c1d Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 19 May 2016 16:15:33 -0700
Subject: [PATCH] set isStopping on other calls to stop

---
 libraries/script-engine/src/ScriptEngines.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp
index 65e08938b3..8b57487db0 100644
--- a/libraries/script-engine/src/ScriptEngines.cpp
+++ b/libraries/script-engine/src/ScriptEngines.cpp
@@ -160,6 +160,7 @@ void ScriptEngines::shutdownScripting() {
             scriptEngine->disconnect(this);
 
             // Gracefully stop the engine's scripting thread
+            scriptEngine->setIsStopping();
             scriptEngine->stop();
 
             // We need to wait for the engine to be done running before we proceed, because we don't
@@ -353,7 +354,6 @@ void ScriptEngines::stopAllScripts(bool restart) {
         }
         it.value()->setIsStopping();
         QMetaObject::invokeMethod(it.value(), "stop");
-        //it.value()->stop();
         qCDebug(scriptengine) << "stopping script..." << it.key();
     }
 }
@@ -370,13 +370,13 @@ bool ScriptEngines::stopScript(const QString& rawScriptURL, bool restart) {
         if (_scriptEnginesHash.contains(scriptURL)) {
             ScriptEngine* scriptEngine = _scriptEnginesHash[scriptURL];
             if (restart) {
-                scriptEngine->setIsStopping();
                 auto scriptCache = DependencyManager::get<ScriptCache>();
                 scriptCache->deleteScript(scriptURL);
                 connect(scriptEngine, &ScriptEngine::finished, this, [this](QString scriptName, ScriptEngine* engine) {
                     reloadScript(scriptName);
                 });
             }
+            scriptEngine->setIsStopping();
             scriptEngine->stop();
             stoppedScript = true;
             qCDebug(scriptengine) << "stopping script..." << scriptURL;