Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 09:25:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4647 from huffman/fix-multiple-scripts-on-restart

Browse source 
Fix stop/reload all scripts affecting already-stopped scripts
This commit is contained in:
Clément Brisset 2015-04-17 16:29:23 +02:00
commit 516acee1c7
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Application.cpp
View file

@ -3867,6 +3867,9 @@ void Application::stopAllScripts(bool restart) {
// stops all current running scripts
for (QHash<QString, ScriptEngine*>::const_iterator it = _scriptEnginesHash.constBegin();
it != _scriptEnginesHash.constEnd(); it++) {
if (it.value()->isFinished()) {
continue;
}
if (restart && it.value()->isUserLoaded()) {
connect(it.value(), SIGNAL(finished(const QString&)), SLOT(loadScript(const QString&)));
}

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

@ -647,8 +647,10 @@ void ScriptEngine::stopAllTimers() {
}
void ScriptEngine::stop() {
_isFinished = true;
emit runningStateChanged();
if (!_isFinished) {
_isFinished = true;
emit runningStateChanged();
}
}
void ScriptEngine::timerFired() {