Fix hang on new script on shutdown

Zach Pomerantz committed 10 years ago

Commit a0d80b91 parent 22081a81 file · +5 −8Browse files

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

Unified · Split

 }
 void ScriptEngines::addScriptEngine(ScriptEngine* engine) {
-    _allScriptsMutex.lock();
+    if (!_stoppingAllScripts) {
-    _allKnownScriptEngines.insert(engine);
+        _allKnownScriptEngines.insert(engine);
-    _allScriptsMutex.unlock();
+    }
 }
 void ScriptEngines::removeScriptEngine(ScriptEngine* engine) {
     // from the list of running scripts. We don't do this if we're in the process of stopping all scripts
     // because that method removes scripts from its list as it iterates them
     if (!_stoppingAllScripts) {
-        _allScriptsMutex.lock();
+        QMutexLocker locker(&_allScriptsMutex);
         _allKnownScriptEngines.remove(engine);
-        _allScriptsMutex.unlock();
     }
 }
 void ScriptEngines::shutdownScripting() {
-    _allScriptsMutex.lock();
     _stoppingAllScripts = true;
     ScriptEngine::_stoppingAllScripts = true;
+    QMutexLocker locker(&_allScriptsMutex);
     qCDebug(scriptengine) << "Stopping all scripts.... currently known scripts:" << _allKnownScriptEngines.size();
     QMutableSetIterator<ScriptEngine*> i(_allKnownScriptEngines);
             i.remove();
         }
     }
-    _stoppingAllScripts = false;
-    _allScriptsMutex.unlock();
     qCDebug(scriptengine) << "DONE Stopping all scripts....";
 }