From cc581fd06ed8b017aa7c87f740056921479f23f8 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Wed, 16 Dec 2009 16:37:24 +1000 Subject: Crash --- src/declarative/qml/qmlbindingvme.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/declarative/qml/qmlbindingvme.cpp b/src/declarative/qml/qmlbindingvme.cpp index d85d7ba..5abcdb8 100644 --- a/src/declarative/qml/qmlbindingvme.cpp +++ b/src/declarative/qml/qmlbindingvme.cpp @@ -1002,11 +1002,12 @@ This does not clear the global "commited binding" states. void QmlBindingCompilerPrivate::resetInstanceState() { registers = 0; + registerCleanups.clear(); strings = committed.strings; data = committed.data; - subscriptionIds = committed.subscriptionIds; - subscriptionSet.clear(); usedSubscriptionIds.clear(); + subscriptionSet.clear(); + subscriptionIds = committed.subscriptionIds; bytecode.clear(); } @@ -1870,7 +1871,7 @@ Returns true if any bindings were compiled. */ bool QmlBindingCompiler::isValid() const { - return d->bytecode.count(); + return !d->committed.bytecode.isEmpty(); } /* -- cgit v0.12