From 4b36e00eba66eab873d3fe15aa3ceedd5dd18ae0 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Wed, 21 Oct 2009 09:17:18 +1000
Subject: Revert "Additional temporary fix for animation bug."

This reverts commit 04eae20d3b86cc61ab3b3bdded74caa370a84c43.
---
 src/corelib/animation/qabstractanimation.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp
index 8d34a98..f23ad3c 100644
--- a/src/corelib/animation/qabstractanimation.cpp
+++ b/src/corelib/animation/qabstractanimation.cpp
@@ -228,7 +228,11 @@ void QUnifiedTimer::updateAnimationsTime()
 
 void QUnifiedTimer::restartAnimationTimer()
 {
-    if (!animationTimer.isActive()) {
+    if (runningLeafAnimations == 0 && !runningPauseAnimations.isEmpty()) {
+        int closestTimeToFinish = closestPauseAnimationTimeToFinish();
+        animationTimer.start(closestTimeToFinish, this);
+        isPauseTimerActive = true;
+    } else if (!animationTimer.isActive() || isPauseTimerActive) {
         animationTimer.start(timingInterval, this);
         isPauseTimerActive = false;
     }
-- 
cgit v0.12