Showing the changes to interface/src/ui/ScriptEditorWidget.cpp (1 of 4 files). Show all
Unified · Split
| @@ -57,6 +57,11 @@ void ScriptEditorWidget::onScriptModified() { · 56 unmodified lines | ||
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | +void ScriptEditorWidget::onScriptEnding() { | |
| 61 | + // signals will automatically be disonnected when the _scriptEngine is deleted later | |
| 62 | + _scriptEngine = NULL; | |
| 63 | +} | |
| 64 | + | |
| 60 | 65 | bool ScriptEditorWidget::isModified() { |
| 61 | 66 | return _scriptEditorWidgetUI->scriptEdit->document()->isModified(); |
| 62 | 67 | } |
| @@ -69,11 +74,13 @@ bool ScriptEditorWidget::setRunning(bool run) { · 6 unmodified lines | ||
| 69 | 74 | if (run && !save()) { |
| 70 | 75 | return false; |
| 71 | 76 | } |
| 77 | + | |
| 72 | 78 | // Clean-up old connections. |
| 73 | 79 | if (_scriptEngine != NULL) { |
| 74 | 80 | disconnect(_scriptEngine, &ScriptEngine::runningStateChanged, this, &ScriptEditorWidget::runningStateChanged); |
| 75 | 81 | disconnect(_scriptEngine, &ScriptEngine::errorMessage, this, &ScriptEditorWidget::onScriptError); |
| 76 | 82 | disconnect(_scriptEngine, &ScriptEngine::printedMessage, this, &ScriptEditorWidget::onScriptPrint); |
| 83 | + disconnect(_scriptEngine, &ScriptEngine::scriptEnding, this, &ScriptEditorWidget::onScriptEnding); | |
| 77 | 84 | } |
| 78 | 85 | |
| 79 | 86 | if (run) { |
| @@ -83,6 +90,7 @@ bool ScriptEditorWidget::setRunning(bool run) { · 3 unmodified lines | ||
| 83 | 90 | // Make new connections. |
| 84 | 91 | connect(_scriptEngine, &ScriptEngine::errorMessage, this, &ScriptEditorWidget::onScriptError); |
| 85 | 92 | connect(_scriptEngine, &ScriptEngine::printedMessage, this, &ScriptEditorWidget::onScriptPrint); |
| 93 | + connect(_scriptEngine, &ScriptEngine::scriptEnding, this, &ScriptEditorWidget::onScriptEnding); | |
| 86 | 94 | } else { |
| 87 | 95 | Application::getInstance()->stopScript(_currentScript); |
| 88 | 96 | _scriptEngine = NULL; |
| @@ -125,6 +133,7 @@ void ScriptEditorWidget::loadFile(const QString& scriptPath) { · 36 unmodified lines | ||
| 125 | 133 | disconnect(_scriptEngine, &ScriptEngine::runningStateChanged, this, &ScriptEditorWidget::runningStateChanged); |
| 126 | 134 | disconnect(_scriptEngine, &ScriptEngine::errorMessage, this, &ScriptEditorWidget::onScriptError); |
| 127 | 135 | disconnect(_scriptEngine, &ScriptEngine::printedMessage, this, &ScriptEditorWidget::onScriptPrint); |
| 136 | + disconnect(_scriptEngine, &ScriptEngine::scriptEnding, this, &ScriptEditorWidget::onScriptEnding); | |
| 128 | 137 | } |
| 129 | 138 | } else { |
| 130 | 139 | QNetworkAccessManager* networkManager = new QNetworkAccessManager(this); |
| @@ -144,6 +153,7 @@ void ScriptEditorWidget::loadFile(const QString& scriptPath) { · 13 unmodified lines | ||
| 144 | 153 | connect(_scriptEngine, &ScriptEngine::runningStateChanged, this, &ScriptEditorWidget::runningStateChanged); |
| 145 | 154 | connect(_scriptEngine, &ScriptEngine::errorMessage, this, &ScriptEditorWidget::onScriptError); |
| 146 | 155 | connect(_scriptEngine, &ScriptEngine::printedMessage, this, &ScriptEditorWidget::onScriptPrint); |
| 156 | + connect(_scriptEngine, &ScriptEngine::scriptEnding, this, &ScriptEditorWidget::onScriptEnding); | |
| 147 | 157 | } |
| 148 | 158 | } |
| 149 | 159 | |