diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-06-24 05:15:05 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-06-24 05:15:05 (GMT) |
commit | 1b4d6818865548b752008242ddbea6a4e5206684 (patch) | |
tree | 6fadb7ba12c9a40da35343bffec29e61db3d0ae8 /src/declarative | |
parent | 29a406e3622ba44ccf35c6913fbb4ad098674092 (diff) | |
parent | f2fc1355306219eaec9042462d3be4aceed1b829 (diff) | |
download | Qt-1b4d6818865548b752008242ddbea6a4e5206684.zip Qt-1b4d6818865548b752008242ddbea6a4e5206684.tar.gz Qt-1b4d6818865548b752008242ddbea6a4e5206684.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative')
-rw-r--r-- | src/declarative/util/qdeclarativeanimation.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index f807866..add27f3 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -176,6 +176,8 @@ void QDeclarativeAbstractAnimation::setRunning(bool r) { Q_D(QDeclarativeAbstractAnimation); if (!d->componentComplete) { + if (d->running && r == d->running) //don't re-register + return; d->running = r; if (r == false) d->avoidPropertyValueSourceStart = true; |