Merge pull request #6513 from huffman/fix-script-race-condition

Fix ScriptEngine setting _isFinished when it shouldn't, causing scripts to accumulate when restarting

Brad Hefta-Gaub committed 10 years ago

Commit 46556b72 parents fa52b97 4d843621 file · +0 −1Browse files

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

Unified · Split

@@ -674,7 +674,6 @@ void ScriptEngine::run() { · 673 unmodified lines
674	}	674	}
675		675
676	_isRunning = true;	676	_isRunning = true;
677	_isFinished = false;
678	if (_wantSignals) {	677	if (_wantSignals) {
679	emit runningStateChanged();	678	emit runningStateChanged();
680	}	679	}