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
423423 qCWarning(scriptengine) << "Script Engine has been running too long, aborting:" << getFilename();
424424 abortEvaluation();
425425 } else {
426− qCWarning(scriptengine) << "Script Engine has been running too long, throwing:" << getFilename();
427426 auto context = currentContext();
428427 if (context) {
428+ qCWarning(scriptengine) << "Script Engine has been running too long, throwing:" << getFilename();
429429 context->throwError("Timed out during shutdown");
430430 }
431431 }
@@ -450,9 +450,9 @@ void ScriptEngine::waitTillDoneRunning() { · 18 unmodified lines
450450 qCWarning(scriptengine) << "Script Engine has been running too long, aborting:" << getFilename();
451451 abortEvaluation();
452452 } else {
453− qCWarning(scriptengine) << "Script Engine has been running too long, throwing:" << getFilename();
454453 auto context = currentContext();
455454 if (context) {
455+ qCWarning(scriptengine) << "Script Engine has been running too long, throwing:" << getFilename();
456456 context->throwError("Timed out during shutdown");
457457 }
458458 }