CR round 2

Zach Fox committed 8 years ago

Commit e0ca5351 parent 142dfab2 files · +4 −4Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+2−2

@@ -418,10 +418,10 @@ void ScriptEngine::waitTillDoneRunning() { · 417 unmodified lines
418	workerThread->quit();	418	workerThread->quit();
419		419
420	if (isEvaluating()) {	420	if (isEvaluating()) {
421	qCWarning(scriptengine) << "Script Engine has been running too long, aborting.";	421	qCWarning(scriptengine) << "Script Engine has been running too long, aborting:" << getFilename();
422	abortEvaluation();	422	abortEvaluation();
423	} else {	423	} else {
424	qCWarning(scriptengine) << "Script Engine has been running too long, throwing.";	424	qCWarning(scriptengine) << "Script Engine has been running too long, throwing:" << getFilename();
425	auto context = currentContext();	425	auto context = currentContext();
426	if (context) {	426	if (context) {
427	context->throwError("Timed out during shutdown");	427	context->throwError("Timed out during shutdown");