History

Don't crash on script destructor

Brad Davis committed 10 years ago

Commit c07f3781 parent b4a7dc11 file · +6 −1Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+6−1
@@ -144,7 +144,12 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNam · 143 unmodified lines
144144 ScriptEngine::~ScriptEngine() {
145145 qCDebug(scriptengine) << "Script Engine shutting down (destructor) for script:" << getFilename();
146146
147− DependencyManager::get<ScriptEngines>()->removeScriptEngine(this);
147+ auto scriptEngines = DependencyManager::get<ScriptEngines>();
148+ if (scriptEngines) {
149+ scriptEngines->removeScriptEngine(this);
150+ } else {
151+ qCWarning(scriptengine) << "Script destroyed after ScriptEngines!";
152+ }
148153 }
149154
150155 void ScriptEngine::disconnectNonEssentialSignals() {