History

Merge branch 'master' of github.com:highfidelity/hifi into fix/debug-script-crash

Zach Pomerantz committed 10 years ago

Commit 4c8ff552 parents c480dcf 8760cd088 files · +4196 −3718Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+5−0
@@ -983,6 +983,11 @@ void ScriptEngine::updateMemoryCost(const qint64& deltaSize) { · 982 unmodified lines
983}983}
984 984
985void ScriptEngine::timerFired() {985void ScriptEngine::timerFired() {
986 if (DependencyManager::get<ScriptEngines>()->isStopped()) {
987 qCDebug(scriptengine) << "Script.timerFired() while shutting down is ignored... parent script:" << getFilename();
988 return; // bail early
989 }
990
986 QTimer* callingTimer = reinterpret_cast<QTimer*>(sender());991 QTimer* callingTimer = reinterpret_cast<QTimer*>(sender());
987 CallbackData timerData = _timerFunctionMap.value(callingTimer);992 CallbackData timerData = _timerFunctionMap.value(callingTimer);
988 993