From 2ba1454ff6e3468f8871d2de3afbef8f80b3da07 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Fri, 6 Nov 2009 09:14:04 +1000
Subject: Fix bad merge.

---
 src/corelib/animation/qabstractanimation.cpp | 4 ++--
 1 file 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);
-- 
cgit v0.12