History

Catch any on-the-fly modifications made while script is restarting

David Rowe committed 12 years ago

Commit 3df43dc1 parent 74200781 file · +5 −1Browse files

Showing the changes to interface/src/ui/ScriptEditorWidget.cpp (1 of 1 file). Show all

Unified · Split

interface/src/ui/ScriptEditorWidget.cpp+5−1
@@ -52,7 +52,7 @@ ScriptEditorWidget::~ScriptEditorWidget() { · 51 unmodified lines
5252 }
5353
5454 void ScriptEditorWidget::onScriptModified() {
55− if(_scriptEditorWidgetUI->onTheFlyCheckBox->isChecked() && isRunning()) {
55+ if(_scriptEditorWidgetUI->onTheFlyCheckBox->isChecked() && isModified() && isRunning()) {
5656 _isRestarting = true;
5757 setRunning(false);
5858 // Script is restarted once current script instance finishes.
@@ -84,6 +84,7 @@ bool ScriptEditorWidget::setRunning(bool run) { · 25 unmodified lines
8484 disconnect(_scriptEngine, &ScriptEngine::runningStateChanged, this, &ScriptEditorWidget::runningStateChanged);
8585 disconnect(_scriptEngine, &ScriptEngine::errorMessage, this, &ScriptEditorWidget::onScriptError);
8686 disconnect(_scriptEngine, &ScriptEngine::printedMessage, this, &ScriptEditorWidget::onScriptPrint);
87+ disconnect(_scriptEngine, &ScriptEngine::update, this, &ScriptEditorWidget::onScriptModified);
8788 disconnect(_scriptEngine, &ScriptEngine::finished, this, &ScriptEditorWidget::onScriptFinished);
8889 }
8990
@@ -93,6 +94,7 @@ bool ScriptEditorWidget::setRunning(bool run) { · 3 unmodified lines
9394 connect(_scriptEngine, &ScriptEngine::runningStateChanged, this, &ScriptEditorWidget::runningStateChanged);
9495 connect(_scriptEngine, &ScriptEngine::errorMessage, this, &ScriptEditorWidget::onScriptError);
9596 connect(_scriptEngine, &ScriptEngine::printedMessage, this, &ScriptEditorWidget::onScriptPrint);
97+ connect(_scriptEngine, &ScriptEngine::update, this, &ScriptEditorWidget::onScriptModified);
9698 connect(_scriptEngine, &ScriptEngine::finished, this, &ScriptEditorWidget::onScriptFinished);
9799 } else {
98100 connect(_scriptEngine, &ScriptEngine::finished, this, &ScriptEditorWidget::onScriptFinished);
@@ -137,6 +139,7 @@ void ScriptEditorWidget::loadFile(const QString& scriptPath) { · 38 unmodified lines
137139 disconnect(_scriptEngine, &ScriptEngine::runningStateChanged, this, &ScriptEditorWidget::runningStateChanged);
138140 disconnect(_scriptEngine, &ScriptEngine::errorMessage, this, &ScriptEditorWidget::onScriptError);
139141 disconnect(_scriptEngine, &ScriptEngine::printedMessage, this, &ScriptEditorWidget::onScriptPrint);
142+ disconnect(_scriptEngine, &ScriptEngine::update, this, &ScriptEditorWidget::onScriptModified);
140143 disconnect(_scriptEngine, &ScriptEngine::finished, this, &ScriptEditorWidget::onScriptFinished);
141144 }
142145 } else {
@@ -158,6 +161,7 @@ void ScriptEditorWidget::loadFile(const QString& scriptPath) { · 15 unmodified lines
158161 connect(_scriptEngine, &ScriptEngine::runningStateChanged, this, &ScriptEditorWidget::runningStateChanged);
159162 connect(_scriptEngine, &ScriptEngine::errorMessage, this, &ScriptEditorWidget::onScriptError);
160163 connect(_scriptEngine, &ScriptEngine::printedMessage, this, &ScriptEditorWidget::onScriptPrint);
164+ connect(_scriptEngine, &ScriptEngine::update, this, &ScriptEditorWidget::onScriptModified);
161165 connect(_scriptEngine, &ScriptEngine::finished, this, &ScriptEditorWidget::onScriptFinished);
162166 }
163167 }