From 107b1b830eb156077546016e2042ad0867a24679 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Wed, 18 May 2016 17:46:12 -0700
Subject: [PATCH] Stop ScriptCache callbacks when scripts are stopped

---
 libraries/script-engine/src/ScriptCache.cpp | 43 ++++++++++++---------
 libraries/script-engine/src/ScriptEngines.h |  2 +-
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/libraries/script-engine/src/ScriptCache.cpp b/libraries/script-engine/src/ScriptCache.cpp
index 3ebd3d53ce..2114289095 100644
--- a/libraries/script-engine/src/ScriptCache.cpp
+++ b/libraries/script-engine/src/ScriptCache.cpp
@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "ScriptCache.h"
+
 #include <QCoreApplication>
 #include <QEventLoop>
 #include <QNetworkAccessManager>
@@ -20,7 +22,7 @@
 #include <assert.h>
 #include <SharedUtil.h>
 
-#include "ScriptCache.h"
+#include "ScriptEngines.h"
 #include "ScriptEngineLogging.h"
 
 ScriptCache::ScriptCache(QObject* parent) {
@@ -78,22 +80,25 @@ void ScriptCache::scriptDownloaded() {
     QList<ScriptUser*> scriptUsers = _scriptUsers.values(url);
     _scriptUsers.remove(url);
 
-    if (req->getResult() == ResourceRequest::Success) {
-        auto scriptContents = req->getData();
-        _scriptCache[url] = scriptContents;
-        lock.unlock();
-        qCDebug(scriptengine) << "Done downloading script at:" << url.toString();
+    if (!DependencyManager::get<ScriptEngines>()->isStopped()) {
+        if (req->getResult() == ResourceRequest::Success) {
+            auto scriptContents = req->getData();
+            _scriptCache[url] = scriptContents;
+            lock.unlock();
+            qCDebug(scriptengine) << "Done downloading script at:" << url.toString();
 
-        foreach(ScriptUser* user, scriptUsers) {
-            user->scriptContentsAvailable(url, scriptContents);
-        }
-    } else {
-        lock.unlock();
-        qCWarning(scriptengine) << "Error loading script from URL " << url;
-        foreach(ScriptUser* user, scriptUsers) {
-            user->errorInLoadingScript(url);
+            foreach(ScriptUser* user, scriptUsers) {
+                user->scriptContentsAvailable(url, scriptContents);
+            }
+        } else {
+            lock.unlock();
+            qCWarning(scriptengine) << "Error loading script from URL " << url;
+            foreach(ScriptUser* user, scriptUsers) {
+                user->errorInLoadingScript(url);
+            }
         }
     }
+
     req->deleteLater();
 }
 
@@ -162,9 +167,11 @@ void ScriptCache::scriptContentAvailable() {
         }
     }
 
-    foreach(contentAvailableCallback thisCallback, allCallbacks) {
-        thisCallback(url.toString(), scriptContent, true, success);
-    }
     req->deleteLater();
-}
 
+    if (!DependencyManager::get<ScriptEngines>()->isStopped()) {
+        foreach(contentAvailableCallback thisCallback, allCallbacks) {
+            thisCallback(url.toString(), scriptContent, true, success);
+        }
+    }
+}
diff --git a/libraries/script-engine/src/ScriptEngines.h b/libraries/script-engine/src/ScriptEngines.h
index 72bf7d529e..a9c273b2a7 100644
--- a/libraries/script-engine/src/ScriptEngines.h
+++ b/libraries/script-engine/src/ScriptEngines.h
@@ -68,6 +68,7 @@ public:
 
     // Called at shutdown time
     void shutdownScripting();
+    bool isStopped() const { return _isStopped; }
 
 signals:
     void scriptCountChanged();
@@ -86,7 +87,6 @@ protected:
     void onScriptEngineLoaded(const QString& scriptFilename);
     void onScriptEngineError(const QString& scriptFilename);
     void launchScriptEngine(ScriptEngine* engine);
-    bool isStopped() const { return _isStopped; }
 
     QReadWriteLock _scriptEnginesHashLock;
     QHash<QUrl, ScriptEngine*> _scriptEnginesHash;