This commit is contained in:
Atlante45 2015-10-28 17:11:46 -07:00
parent 7695afec0a
commit 136747929e

View file

@ -96,7 +96,7 @@ static bool hasCorrectSyntax(const QScriptProgram& program) {
return true; return true;
} }
static bool hadUncauchtExceptions(QScriptEngine& engine, const QString& fileName) { static bool hadUncaughtExceptions(QScriptEngine& engine, const QString& fileName) {
if (engine.hasUncaughtException()) { if (engine.hasUncaughtException()) {
const auto backtrace = engine.uncaughtExceptionBacktrace(); const auto backtrace = engine.uncaughtExceptionBacktrace();
const auto exception = engine.uncaughtException().toString(); const auto exception = engine.uncaughtException().toString();
@ -616,7 +616,7 @@ QScriptValue ScriptEngine::evaluate(const QString& sourceCode, const QString& fi
const auto result = QScriptEngine::evaluate(program); const auto result = QScriptEngine::evaluate(program);
--_evaluatesPending; --_evaluatesPending;
const auto hadUncaughtException = hadUncauchtExceptions(*this, program.fileName()); const auto hadUncaughtException = hadUncaughtExceptions(*this, program.fileName());
if (_wantSignals) { if (_wantSignals) {
emit evaluationFinished(result, hadUncaughtException); emit evaluationFinished(result, hadUncaughtException);
} }
@ -686,7 +686,7 @@ void ScriptEngine::run() {
lastUpdate = now; lastUpdate = now;
// Debug and clear exceptions // Debug and clear exceptions
hadUncauchtExceptions(*this, _fileNameString); hadUncaughtExceptions(*this, _fileNameString);
} }
stopAllTimers(); // make sure all our timers are stopped if the script is ending stopAllTimers(); // make sure all our timers are stopped if the script is ending
@ -1021,7 +1021,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co
QScriptEngine sandbox; QScriptEngine sandbox;
QScriptValue testConstructor = sandbox.evaluate(program); QScriptValue testConstructor = sandbox.evaluate(program);
if (hadUncauchtExceptions(sandbox, program.fileName())) { if (hadUncaughtExceptions(sandbox, program.fileName())) {
return; return;
} }