History

Only say we're throwing a script error when we mean it

sabrina-shanman committed 7 years ago

Commit 437f6b41 parent 67a06b31 file · +2 −2Browse 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+2−2
@@ -423,9 +423,9 @@ void ScriptEngine::waitTillDoneRunning() { · 422 unmodified lines
423 qCWarning(scriptengine) << "Script Engine has been running too long, aborting:" << getFilename();423 qCWarning(scriptengine) << "Script Engine has been running too long, aborting:" << getFilename();
424 abortEvaluation();424 abortEvaluation();
425 } else {425 } else {
426 qCWarning(scriptengine) << "Script Engine has been running too long, throwing:" << getFilename();
427 auto context = currentContext();426 auto context = currentContext();
428 if (context) {427 if (context) {
428 qCWarning(scriptengine) << "Script Engine has been running too long, throwing:" << getFilename();
429 context->throwError("Timed out during shutdown");429 context->throwError("Timed out during shutdown");
430 }430 }
431 }431 }
@@ -450,9 +450,9 @@ void ScriptEngine::waitTillDoneRunning() { · 18 unmodified lines
450 qCWarning(scriptengine) << "Script Engine has been running too long, aborting:" << getFilename();450 qCWarning(scriptengine) << "Script Engine has been running too long, aborting:" << getFilename();
451 abortEvaluation();451 abortEvaluation();
452 } else {452 } else {
453 qCWarning(scriptengine) << "Script Engine has been running too long, throwing:" << getFilename();
454 auto context = currentContext();453 auto context = currentContext();
455 if (context) {454 if (context) {
455 qCWarning(scriptengine) << "Script Engine has been running too long, throwing:" << getFilename();
456 context->throwError("Timed out during shutdown");456 context->throwError("Timed out during shutdown");
457 }457 }
458 }458 }