From bc785115a938c36763e418e8707c88475270c1c7 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Tue, 8 Jul 2014 16:33:31 -0700
Subject: [PATCH] Fix script errors not being reported

Script.update event needs to be emitted after reporting any script errors.
---
 libraries/script-engine/src/ScriptEngine.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index e93a7125b9..f5f15331ac 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -515,8 +515,6 @@ void ScriptEngine::run() {
 
         qint64 now = usecTimestampNow();
         float deltaTime = (float) (now - lastUpdate) / (float) USECS_PER_SECOND;
-        emit update(deltaTime);
-        lastUpdate = now;
 
         if (_engine.hasUncaughtException()) {
             int line = _engine.uncaughtExceptionLineNumber();
@@ -524,6 +522,9 @@ void ScriptEngine::run() {
             emit errorMessage("Uncaught exception at (" + _fileNameString + ") line" + QString::number(line) + ":" + _engine.uncaughtException().toString());
             _engine.clearExceptions();
         }
+
+        emit update(deltaTime);
+        lastUpdate = now;
     }
     emit scriptEnding();