Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 3 files). Show all
Unified · Split
| @@ -145,9 +145,7 @@ ScriptEngine::~ScriptEngine() { · 144 unmodified lines | ||
| 145 | 145 | qCDebug(scriptengine) << "Script Engine shutting down (destructor) for script:" << getFilename(); |
| 146 | 146 | auto scriptEngines = DependencyManager::get<ScriptEngines>(); |
| 147 | 147 | if (scriptEngines) { |
| 148 | − qCDebug(scriptengine) << "About to remove ScriptEngine [" << getFilename() << "] from ScriptEngines!"; | |
| 149 | 148 | scriptEngines->removeScriptEngine(this); |
| 150 | − qCDebug(scriptengine) << "AFTER remove ScriptEngine [" << getFilename() << "] from ScriptEngines!"; | |
| 151 | 149 | } else { |
| 152 | 150 | qCWarning(scriptengine) << "Script destroyed after ScriptEngines!"; |
| 153 | 151 | } |
| @@ -759,6 +757,7 @@ void ScriptEngine::stop() { · 605 unmodified lines | ||
| 759 | 757 | QMetaObject::invokeMethod(this, "stop"); |
| 760 | 758 | return; |
| 761 | 759 | } |
| 760 | + abortEvaluation(); // abort any script evaluation that may be active | |
| 762 | 761 | _isFinished = true; |
| 763 | 762 | if (_wantSignals) { |
| 764 | 763 | emit runningStateChanged(); |