History

Merge branch 'master' of https://github.com/highfidelity/hifi into baseball

Atlante45 committed 11 years ago

Commit 55c67062 parents 35b13b1 7be537c57 files · +1522 −239Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+4−3
@@ -646,13 +646,14 @@ QScriptValue ScriptEngine::evaluate(const QString& sourceCode, const QString& fi · 645 unmodified lines
646}646}
647 647
648void ScriptEngine::run() {648void ScriptEngine::run() {
649 // TODO: can we add a short circuit for _stoppingAllScripts here? What does it mean to not start running if649 if (_stoppingAllScripts) {
650 // we're in the process of stopping?650 return; // bail early - avoid setting state in init(), as evaluate() will bail too
651 }
651 652
652 if (!_isInitialized) {653 if (!_isInitialized) {
653 init();654 init();
654 }655 }
655 656
656 _isRunning = true;657 _isRunning = true;
657 _isFinished = false;658 _isFinished = false;
658 if (_wantSignals) {659 if (_wantSignals) {