whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop animation driver in the appropriate place. 

Calling stop from restartAnimationTimer was incorrect (it was initially
added as a fix after the introduction of QAnimationDriver, but this is
a better location for the fix).

Change-Id: I2507096b846ada061e36a9ece6aa814d801ddd53
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
bb10
Michael Brasser 2011-12-12 14:51:15 +10:00 committed by Qt by Nokia
parent 30a4d9bc99
commit 5d00ae3b69
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/animation/qabstractanimation.cpp
View File

@ -269,8 +269,7 @@ void QUnifiedTimer::restartAnimationTimer()
if (pauseTimer.isActive())
pauseTimer.stop();
driver->start();
} else if (runningLeafAnimations == 0)
driver->stop();
}
}
void QUnifiedTimer::setTimingInterval(int interval)
@ -303,6 +302,7 @@ void QUnifiedTimer::stopTimer()
{
stopTimerPending = false;
if (animations.isEmpty()) {
driver->stop();
pauseTimer.stop();
// invalidate the start reference time
time.invalidate();