trying to mimic previous behavior more closely

Seth Alves committed 10 years ago

Commit b0ce65e1 parent 04bd27e6 files · +29 −21Browse files

Showing the changes to libraries/script-engine/src/ScriptEngines.cpp (1 of 6 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngines.cpp+18−13

             scriptEngine->disconnect(this);
             // Gracefully stop the engine's scripting thread
-            scriptEngine->stop();
+            scriptEngine->stop(false);
             // We need to wait for the engine to be done running before we proceed, because we don't
             // want any of the scripts final "scriptEnding()" or pending "update()" methods from accessing
     QList<QUrl> urls = _scriptEnginesHash.keys();
     QStringList result;
     for (auto url : urls) {
-        result.append(url.toString());
+        ScriptEngine* engine = getScriptEngineInternal(url);
+        if (engine) {
+            result.append(url.toString());
+        }
     }
     return result;
 }
                 reloadScript(scriptName);
             });
         }
-        it.value()->stop();
+        it.value()->stop(true);
         qCDebug(scriptengine) << "stopping script..." << it.key();
     }
 }
                     reloadScript(scriptName);
                 });
             }
-            scriptEngine->stop();
+            scriptEngine->stop(false);
             stoppedScript = true;
             qCDebug(scriptengine) << "stopping script..." << scriptURL;
         }
     }
     auto scriptEngine = getScriptEngine(scriptUrl);
-    if (scriptEngine) {
+    if (scriptEngine && !scriptEngine->isStopping()) {
         return scriptEngine;
     }
     return scriptEngine;
 }
-ScriptEngine* ScriptEngines::getScriptEngine(const QUrl& rawScriptURL) {
+ScriptEngine* ScriptEngines::getScriptEngineInternal(const QUrl& rawScriptURL) {
     ScriptEngine* result = nullptr;
-    {
+    const QUrl scriptURL = normalizeScriptURL(rawScriptURL);
-        QReadLocker lock(&_scriptEnginesHashLock);
+    auto it = _scriptEnginesHash.find(scriptURL);
-        const QUrl scriptURL = normalizeScriptURL(rawScriptURL);
+    if (it != _scriptEnginesHash.end()) {
-        auto it = _scriptEnginesHash.find(scriptURL);
+        result = it.value();
-        if (it != _scriptEnginesHash.end() && !it.value()->isStopping()) {
-            result = it.value();
-        }
     }
     return result;
 }
+ScriptEngine* ScriptEngines::getScriptEngine(const QUrl& rawScriptURL) {
+    QReadLocker lock(&_scriptEnginesHashLock);
+    return getScriptEngineInternal(rawScriptURL);
+}
 // FIXME - change to new version of ScriptCache loading notification
 void ScriptEngines::onScriptEngineLoaded(const QString& rawScriptURL) {
     UserActivityLogger::getInstance().loadedScript(rawScriptURL);