Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 09:57:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8696 from howard-stearns/check-timers-during-shutdown

Browse source 
fix crash in scripted timer on shutdown
This commit is contained in:
Howard Stearns 2016-10-01 10:00:49 -07:00 committed by GitHub
commit 4c5bf3119e
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/script-engine/src/ScriptEngine.cpp
View file

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