History

Abort infinite JS loops on quit

Zach Pomerantz committed 10 years ago

Commit 56ec0e51 parent 284feaf1 file · +1 −0Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+1−0
@@ -216,6 +216,7 @@ void ScriptEngine::waitTillDoneRunning() { · 215 unmodified lines
216 if (elapsedUsecs > MAX_SCRIPT_EVALUATION_TIME) {216 if (elapsedUsecs > MAX_SCRIPT_EVALUATION_TIME) {
217 qCDebug(scriptengine) <<217 qCDebug(scriptengine) <<
218 "Script " << scriptName << " has been running too long [" << elapsedUsecs << " usecs] quitting.";218 "Script " << scriptName << " has been running too long [" << elapsedUsecs << " usecs] quitting.";
219 abortEvaluation(); // to allow the thread to quit
219 workerThread->quit();220 workerThread->quit();
220 break;221 break;
221 }222 }