diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-11-05 23:14:04 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-11-05 23:14:04 (GMT) |
| commit | 2ba1454ff6e3468f8871d2de3afbef8f80b3da07 (patch) | |
| tree | 6389979712bc6edc6c2bd73e0fa4bb048eaf9c4e | |
| parent | 41c740c0e3fe0edb08dea9cfabfb91c26baecee5 (diff) | |
| download | Qt-2ba1454ff6e3468f8871d2de3afbef8f80b3da07.zip Qt-2ba1454ff6e3468f8871d2de3afbef8f80b3da07.tar.gz Qt-2ba1454ff6e3468f8871d2de3afbef8f80b3da07.tar.bz2 | |
Fix bad merge.
| -rw-r--r-- | src/corelib/animation/qabstractanimation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index 94e88aa..5110ce8 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -262,11 +262,11 @@ void QUnifiedTimer::registerAnimation(QAbstractAnimation *animation, bool isTopL void QUnifiedTimer::unregisterAnimation(QAbstractAnimation *animation) { + unregisterRunningAnimation(animation); + if (!QAbstractAnimationPrivate::get(animation)->hasRegisteredTimer) return; - unregisterRunningAnimation(animation); - int idx = animations.indexOf(animation); if (idx != -1) { animations.removeAt(idx); |