History

Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface

Brad Hefta-Gaub committed 12 years ago

Commit d4331db2 parents 43da1ed bb41fe6386 files · +11197 −98919Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+3−4
@@ -148,7 +148,7 @@ void ScriptEngine::evaluate() { · 147 unmodified lines
148 148
149 if (_engine.hasUncaughtException()) {149 if (_engine.hasUncaughtException()) {
150 int line = _engine.uncaughtExceptionLineNumber();150 int line = _engine.uncaughtExceptionLineNumber();
151 qDebug() << "Uncaught exception at line" << line << ":" << result.toString() << "\n";151 qDebug() << "Uncaught exception at line" << line << ":" << result.toString();
152 }152 }
153}153}
154 154
@@ -159,10 +159,9 @@ void ScriptEngine::run() { · 4 unmodified lines
159 _isRunning = true;159 _isRunning = true;
160 160
161 QScriptValue result = _engine.evaluate(_scriptContents);161 QScriptValue result = _engine.evaluate(_scriptContents);
162
163 if (_engine.hasUncaughtException()) {162 if (_engine.hasUncaughtException()) {
164 int line = _engine.uncaughtExceptionLineNumber();163 int line = _engine.uncaughtExceptionLineNumber();
165 qDebug() << "Uncaught exception at line" << line << ":" << result.toString() << "\n";164 qDebug() << "Uncaught exception at line" << line << ":" << result.toString();
166 }165 }
167 166
168 timeval startTime;167 timeval startTime;
@@ -219,7 +218,7 @@ void ScriptEngine::run() { · 50 unmodified lines
219 218
220 if (_engine.hasUncaughtException()) {219 if (_engine.hasUncaughtException()) {
221 int line = _engine.uncaughtExceptionLineNumber();220 int line = _engine.uncaughtExceptionLineNumber();
222 qDebug() << "Uncaught exception at line" << line << ":" << _engine.uncaughtException().toString() << "\n";221 qDebug() << "Uncaught exception at line" << line << ":" << _engine.uncaughtException().toString();
223 }222 }
224 }223 }
225 cleanMenuItems();224 cleanMenuItems();