Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 15:17:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into color

Browse source
This commit is contained in:
samcake 2015-10-28 17:58:04 -07:00
commit fd7582ad31
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/script-engine/src/ScriptEngine.cpp
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);
} }
@ -685,9 +685,8 @@ void ScriptEngine::run() {
} }
lastUpdate = now; lastUpdate = now;
if (hadUncauchtExceptions(*this, _fileNameString)) { // Debug and clear exceptions
stop(); 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
@ -1022,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;
} }