From 56ec0e5db0f84cc76673bcb4f275f62fed8d6915 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Wed, 4 May 2016 12:02:08 -0700
Subject: [PATCH] Abort infinite JS loops on quit

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

diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index ec7bf89548..6c7739c784 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -216,6 +216,7 @@ void ScriptEngine::waitTillDoneRunning() {
             if (elapsedUsecs > MAX_SCRIPT_EVALUATION_TIME) {
                 qCDebug(scriptengine) <<
                     "Script " << scriptName << " has been running too long [" << elapsedUsecs << " usecs] quitting.";
+                abortEvaluation(); // to allow the thread to quit
                 workerThread->quit();
                 break;
             }