From aa58cad93e51ef078a3d6230c15d99b94cf5f86f Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 20 May 2016 09:54:54 -0700
Subject: [PATCH] code review

---
 libraries/script-engine/src/ScriptEngine.cpp  | 7 +++++++
 libraries/script-engine/src/ScriptEngine.h    | 4 +++-
 libraries/script-engine/src/ScriptEngines.cpp | 5 +----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index 67b87ae5e0..d8e0397347 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -938,6 +938,13 @@ void ScriptEngine::stopAllTimersForEntityScript(const EntityItemID& entityID) {
 }
 
 void ScriptEngine::stop() {
+    _isStopping = true; // this can be done on any thread
+
+    // marshal us over to the correct thread
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "stop");
+        return;
+    }
     if (!_isFinished) {
         _isFinished = true;
         emit runningStateChanged();
diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h
index 512e79fb95..6af6aef338 100644
--- a/libraries/script-engine/src/ScriptEngine.h
+++ b/libraries/script-engine/src/ScriptEngine.h
@@ -84,7 +84,7 @@ public:
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // NOTE - this is intended to be a public interface for Agent scripts, and local scripts, but not for EntityScripts
-    Q_INVOKABLE void stop();
+    Q_INVOKABLE void stop(); // this can be called from any thread
 
     // Stop any evaluating scripts and wait for the scripting thread to finish.
     void waitTillDoneRunning();
@@ -146,6 +146,8 @@ public:
 
     bool isFinished() const { return _isFinished; } // used by Application and ScriptWidget
     bool isRunning() const { return _isRunning; } // used by ScriptWidget
+
+    // these are used by code in ScriptEngines.cpp during the "reload all" operation
     bool isStopping() const { return _isStopping; }
     void setIsStopping() { _isStopping = true; }
 
diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp
index 8b57487db0..0d1f0de3c9 100644
--- a/libraries/script-engine/src/ScriptEngines.cpp
+++ b/libraries/script-engine/src/ScriptEngines.cpp
@@ -160,7 +160,6 @@ 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
@@ -352,8 +351,7 @@ void ScriptEngines::stopAllScripts(bool restart) {
                 reloadScript(scriptName);
             });
         }
-        it.value()->setIsStopping();
-        QMetaObject::invokeMethod(it.value(), "stop");
+        it.value()->stop();
         qCDebug(scriptengine) << "stopping script..." << it.key();
     }
 }
@@ -376,7 +374,6 @@ bool ScriptEngines::stopScript(const QString& rawScriptURL, bool restart) {
                     reloadScript(scriptName);
                 });
             }
-            scriptEngine->setIsStopping();
             scriptEngine->stop();
             stoppedScript = true;
             qCDebug(scriptengine) << "stopping script..." << scriptURL;