trying again -- frantic clicking on reload no longer appears to wedge things

Seth Alves committed 10 years ago

Commit 49769f71 parent 75329c86 files · +18 −27Browse 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+12−17

             scriptEngine->disconnect(this);
             // Gracefully stop the engine's scripting thread
-            scriptEngine->stop(false);
+            scriptEngine->stop();
             // 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) {
-        ScriptEngine* engine = getScriptEngineInternal(url);
+        result.append(url.toString());
-        if (engine) {
-            result.append(url.toString());
-        }
     }
     return result;
 }
     // Stop and possibly restart all currently running scripts
     for (QHash<QUrl, ScriptEngine*>::const_iterator it = _scriptEnginesHash.constBegin();
         it != _scriptEnginesHash.constEnd(); it++) {
-        if (it.value()->isFinished()) {
+        if (it.value()->isFinished() || it.value()->isStopping()) {
             continue;
         }
         if (restart && it.value()->isUserLoaded()) {
                     reloadScript(scriptName);
                 });
             }
-            scriptEngine->stop(false);
+            scriptEngine->stop();
             stoppedScript = true;
             qCDebug(scriptengine) << "stopping script..." << scriptURL;
         }
     return scriptEngine;
 }
-ScriptEngine* ScriptEngines::getScriptEngineInternal(const QUrl& rawScriptURL) {
+ScriptEngine* ScriptEngines::getScriptEngine(const QUrl& rawScriptURL) {
     ScriptEngine* result = nullptr;
-    const QUrl scriptURL = normalizeScriptURL(rawScriptURL);
+    {
-    auto it = _scriptEnginesHash.find(scriptURL);
+        QReadLocker lock(&_scriptEnginesHashLock);
-    if (it != _scriptEnginesHash.end()) {
+        const QUrl scriptURL = normalizeScriptURL(rawScriptURL);
-        result = it.value();
+        auto it = _scriptEnginesHash.find(scriptURL);
+        if (it != _scriptEnginesHash.end()) {
+            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);