From f6de476552e16be80f4c191890796c4f4ba95ce4 Mon Sep 17 00:00:00 2001 From: Kim Motoyoshi Kalland Date: Thu, 24 Nov 2011 18:09:04 +0100 Subject: 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 --- src/corelib/animation/qabstractanimation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/animation') 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(); } -- cgit v1.2.3