aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/qquickanimationcontroller.cpp
diff options
context:
space:
mode:
authorCharles Yin <charles.yin@nokia.com>2012-05-28 16:09:26 +1000
committerQt by Nokia <qt-info@nokia.com>2012-05-29 05:57:48 +0200
commitc187ebb93167e69e9e157cb236ef16e39e1b2fb9 (patch)
tree13f25dddf8f5132a6b30d331f486ea99c3362000 /src/quick/util/qquickanimationcontroller.cpp
parent0eec47c65982f586a8602af964b454494f0f49f3 (diff)
Don't use deleted QQuickPathAnimationAnimator
1) If QQuickPathAnimationAnimator was deleted, just return 0 for transition 2) Add Null checking for all animation::transition() calls Change-Id: I1248d08fe05da5c9ff58f7b812ff11545959032f Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/quick/util/qquickanimationcontroller.cpp')
-rw-r--r--src/quick/util/qquickanimationcontroller.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/quick/util/qquickanimationcontroller.cpp b/src/quick/util/qquickanimationcontroller.cpp
index 3013127500..f81b39c8a8 100644
--- a/src/quick/util/qquickanimationcontroller.cpp
+++ b/src/quick/util/qquickanimationcontroller.cpp
@@ -204,11 +204,13 @@ void QQuickAnimationController::reload()
d->animationInstance = d->animation->transition(actions, properties, QQuickAbstractAnimation::Forward);
if (oldInstance && oldInstance != d->animationInstance)
delete oldInstance;
- d->animationInstance->setLoopCount(1);
- d->animationInstance->setDisableUserControl();
- d->animationInstance->start();
- d->animationInstance->pause();
- updateProgress();
+ if (d->animationInstance) {
+ d->animationInstance->setLoopCount(1);
+ d->animationInstance->setDisableUserControl();
+ d->animationInstance->start();
+ d->animationInstance->pause();
+ updateProgress();
+ }
}
}