History

Prevent crash from script timers on shutdown

Zach Pomerantz committed 10 years ago

Commit 8025a3f1 parent 1c5e1bb1 file · +5 −0Browse 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+5−0
@@ -979,6 +979,11 @@ void ScriptEngine::updateMemoryCost(const qint64& deltaSize) { · 978 unmodified lines
979979 }
980980
981981 void ScriptEngine::timerFired() {
982+ if (DependencyManager::get<ScriptEngines>()->isStopped()) {
983+ qCDebug(scriptengine) << "Script.timerFired() while shutting down is ignored... parent script:" << getFilename();
984+ return; // bail early
985+ }
986+
982987 QTimer* callingTimer = reinterpret_cast<QTimer*>(sender());
983988 CallbackData timerData = _timerFunctionMap.value(callingTimer);
984989