diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-01 21:44:57 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-07 02:00:05 +0100 |
| commit | b340caa0d3ebf7f76c0445b2cdd4032d8e3bf8d5 (patch) | |
| tree | e475eae0dc4a6c68ca3ee41132b573fc76d2dc10 /src/qml/jsruntime/qv4value.cpp | |
| parent | e22fc141c3fc5362f9b906c43a1b7c0dbc1f85a3 (diff) | |
Get rid of Members and directly store MemberData::Data pointers
And do the same change for ArrayData.
Change-Id: Ia1ae56bd0ff586c9b987e15af7a53f395a37054a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4value.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4value.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4value.cpp b/src/qml/jsruntime/qv4value.cpp index a80cc40add..e4f84b22fb 100644 --- a/src/qml/jsruntime/qv4value.cpp +++ b/src/qml/jsruntime/qv4value.cpp @@ -91,6 +91,8 @@ double Value::toNumberImpl() const ExecutionContext *ctx = objectValue()->internalClass()->engine->currentContext(); Scope scope(ctx); ScopedValue prim(scope, RuntimeHelpers::toPrimitive(ValueRef::fromRawValue(this), NUMBER_HINT)); + if (scope.engine->hasException) + return 0; return prim->toNumber(); } #endif |