Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 13:19:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6291 from zzmp/fix/script-engine-run-bail

Browse source 
Bail early from ScriptEngine::run if stopped
This commit is contained in:
Stephen Birarda 2015-11-06 10:05:02 -08:00
commit ed960b02ec
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -646,13 +646,14 @@ QScriptValue ScriptEngine::evaluate(const QString& sourceCode, const QString& fi
} }
void ScriptEngine::run() { void ScriptEngine::run() {
// TODO: can we add a short circuit for _stoppingAllScripts here? What does it mean to not start running if if (_stoppingAllScripts) {
// we're in the process of stopping? return; // bail early - avoid setting state in init(), as evaluate() will bail too
}
if (!_isInitialized) { if (!_isInitialized) {
init(); init();
} }
_isRunning = true; _isRunning = true;
_isFinished = false; _isFinished = false;
if (_wantSignals) { if (_wantSignals) {