diff options
Diffstat (limited to 'src/qml/jsruntime/qv4runtime.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4runtime.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp index 54898ca6a1..bc60dba142 100644 --- a/src/qml/jsruntime/qv4runtime.cpp +++ b/src/qml/jsruntime/qv4runtime.cpp @@ -759,11 +759,15 @@ ReturnedValue Runtime::method_iteratorNext(ExecutionEngine *engine, const Value if (!o) return engine->throwTypeError(); ScopedValue d(scope, o->get(engine->id_done())); + if (scope.hasException()) + return Encode::undefined(); bool done = d->toBoolean(); if (done) { *value = Encode::undefined(); } else { *value = o->get(engine->id_value()); + if (scope.hasException()) + return Encode::undefined(); } return Encode(done); } |