diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-10-20 04:07:43 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-10-20 04:08:37 (GMT) |
| commit | 04eae20d3b86cc61ab3b3bdded74caa370a84c43 (patch) | |
| tree | 708390fc01df78346c74f7b1b7cf3c1d248668b2 /src | |
| parent | bb10e8d5570865b6fb1c4c7460600f92ea9f9844 (diff) | |
| download | Qt-04eae20d3b86cc61ab3b3bdded74caa370a84c43.zip Qt-04eae20d3b86cc61ab3b3bdded74caa370a84c43.tar.gz Qt-04eae20d3b86cc61ab3b3bdded74caa370a84c43.tar.bz2 | |
Additional temporary fix for animation bug.
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/animation/qabstractanimation.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index f23ad3c..8d34a98 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -228,11 +228,7 @@ void QUnifiedTimer::updateAnimationsTime() void QUnifiedTimer::restartAnimationTimer() { - if (runningLeafAnimations == 0 && !runningPauseAnimations.isEmpty()) { - int closestTimeToFinish = closestPauseAnimationTimeToFinish(); - animationTimer.start(closestTimeToFinish, this); - isPauseTimerActive = true; - } else if (!animationTimer.isActive() || isPauseTimerActive) { + if (!animationTimer.isActive()) { animationTimer.start(timingInterval, this); isPauseTimerActive = false; } |