Merge pull request #7927 from zzmp/fix/script-timer-crash

fix crash on shutdown from script timers
This commit is contained in:
Brad Hefta-Gaub 2016-05-19 09:52:04 -07:00
commit 232bd475df

View file

@ -979,6 +979,11 @@ void ScriptEngine::updateMemoryCost(const qint64& deltaSize) {
}
void ScriptEngine::timerFired() {
if (DependencyManager::get<ScriptEngines>()->isStopped()) {
qCDebug(scriptengine) << "Script.timerFired() while shutting down is ignored... parent script:" << getFilename();
return; // bail early
}
QTimer* callingTimer = reinterpret_cast<QTimer*>(sender());
CallbackData timerData = _timerFunctionMap.value(callingTimer);