From 3f7d4b985847d49cb47b666535218f2b9b08e0a5 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Tue, 20 Oct 2009 13:41:10 +1000 Subject: Don't accidently override originals. --- src/declarative/util/qmlstate.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp index 98facd9..7e4e992 100644 --- a/src/declarative/util/qmlstate.cpp +++ b/src/declarative/util/qmlstate.cpp @@ -350,7 +350,6 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever if (action.event) { if (!action.event->isReversable()) continue; - action.event->saveOriginals(); for (jj = 0; jj < d->revertList.count(); ++jj) { ActionEvent *event = d->revertList.at(jj).event; if (event && event->typeName() == action.event->typeName()) { @@ -360,6 +359,8 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever } } } + if (!found || action.event != d->revertList.at(jj).event) + action.event->saveOriginals(); } else { action.fromBinding = action.property.binding(); -- cgit v0.12