diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2011-11-24 18:09:04 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-28 06:46:32 +0100 |
| commit | f6de476552e16be80f4c191890796c4f4ba95ce4 (patch) | |
| tree | 13b5c092a1e802e7f625f110bec0384b9388a0c7 /src/corelib/animation/qabstractanimation.cpp | |
| parent | 27e4e91808a07c3ed2ee775ad7daabd33f5bb42a (diff) | |
Fixed QUnifiedTimer cleanup.
When destroying QUnifiedTimer's instance, its default animation
driver is destroyed as well. This patch avoids creating another
QUnifiedTimer instance when the animation driver's destructor
calls QUnifiedTimer::instance().
Change-Id: I9cf254a9d04d79447baa8f27625c3890c3645f08
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/corelib/animation/qabstractanimation.cpp')
| -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 830c5da6b6..b529359f71 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -466,8 +466,8 @@ QAnimationDriver::QAnimationDriver(QAnimationDriverPrivate &dd, QObject *parent) QAnimationDriver::~QAnimationDriver() { - QUnifiedTimer *timer = QUnifiedTimer::instance(true); - if (timer->canUninstallAnimationDriver(this)) + QUnifiedTimer *timer = QUnifiedTimer::instance(false); + if (timer && timer->canUninstallAnimationDriver(this)) uninstall(); } |