1 files changed, 7 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4jscall_p.h b/src/qml/jsruntime/qv4jscall_p.h
index c6d320ac20..3f0c8ee06d 100644
--- a/src/qml/jsruntime/qv4jscall_p.h
+++ b/src/qml/jsruntime/qv4jscall_p.h
@@ -206,7 +206,7 @@ ReturnedValue convertAndCall(
 }
 
 template<typename Callable>
-bool convertAndCall(ExecutionEngine *engine, const Value *thisObject,
+void convertAndCall(ExecutionEngine *engine, const Value *thisObject,
                     void **a, const QMetaType *types, int argc, Callable call)
 {
     Scope scope(engine);
@@ -215,10 +215,13 @@ bool convertAndCall(ExecutionEngine *engine, const Value *thisObject,
     for (int ii = 0; ii < argc; ++ii)
         jsCallData.args[ii] = engine->metaTypeToJS(types[ii + 1], a[ii + 1]);
 
-    ScopedValue jsResult(scope, call(thisObject, jsCallData.args, argc));
     void *result = a[0];
-    if (!result)
-        return !jsResult->isUndefined();
+    if (!result) {
+        call(thisObject, jsCallData.args, argc);
+        return;
+    }
+
+    ScopedValue jsResult(scope, call(thisObject, jsCallData.args, argc));
 
     const QMetaType resultType = types[0];
     if (scope.hasException()) {
@@ -234,7 +237,6 @@ bool convertAndCall(ExecutionEngine *engine, const Value *thisObject,
             scope.engine->metaTypeFromJS(jsResult, resultType, result);
         }
     }
-    return !jsResult->isUndefined();
 }
 
 }