fix JS exception handling in evaluator

This fixes the case where the return value of evaluate is a value but an
internal exception is thrown.

Change-Id: I01edcd6bc64de176da5da3a499c594db45eee789
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/lib/language/evaluator.cpp b/src/lib/language/evaluator.cpp
index 036958d5f..256f38e24 100644
--- a/src/lib/language/evaluator.cpp
+++ b/src/lib/language/evaluator.cpp
@@ -189,8 +189,10 @@ void Evaluator::handleEvaluationError(const Item *item, const QString &name,
         return;
     const ValueConstPtr value = item->property(name);
     CodeLocation location = value ? value->location() : CodeLocation();
-    if (m_scriptEngine->hasUncaughtException())
-        location = CodeLocation(location.fileName(), m_scriptEngine->uncaughtExceptionLineNumber());
+    if (m_scriptEngine->hasUncaughtException()) {
+        throw ErrorInfo(m_scriptEngine->uncaughtException().toString(),
+                CodeLocation(location.fileName(), m_scriptEngine->uncaughtExceptionLineNumber()));
+    }
     throw ErrorInfo(scriptValue.toString(), location);
 }