History

cleanup

Brad Hefta-Gaub committed 10 years ago

Commit 05203631 parent d1f6b373 files · +2 −15Browse files

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

Unified · Split

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