From 8025a3f14cb7602204c02e08a7c5cafaa1ab2eb5 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Wed, 18 May 2016 16:35:07 -0700
Subject: [PATCH] Prevent crash from script timers on shutdown

---
 libraries/script-engine/src/ScriptEngine.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index 15e896fac4..67b87ae5e0 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -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);