From 318f15e3d379f41c2fd74d1b801586e572f3affd Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Wed, 29 Feb 2012 15:47:03 +1000 Subject: Check item before notifying transition has finished Fixes crash when using SmoothedAnimation with view transitions Change-Id: Ib9a201e417c34d64f8144a616e75cae8b67568e2 Reviewed-by: Andrew den Exter --- src/quick/items/qquickitemviewtransition.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/quick/items') diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp index 0f092b76c3..ea81e14871 100644 --- a/src/quick/items/qquickitemviewtransition.cpp +++ b/src/quick/items/qquickitemviewtransition.cpp @@ -163,8 +163,6 @@ void QQuickItemViewTransitionJob::finished() { QDeclarativeTransitionManager::finished(); - if (m_item) - m_item->finishedTransition(); if (m_transitioner) m_transitioner->finishedTransition(m_item); @@ -245,8 +243,11 @@ void QQuickItemViewTransitioner::transitionNextReposition(QQuickViewItem *item, void QQuickItemViewTransitioner::finishedTransition(QQuickViewItem *item) { - if (changeListener) - changeListener->viewItemTransitionFinished(item); + if (item) { + item->finishedTransition(); + if (changeListener) + changeListener->viewItemTransitionFinished(item); + } } -- cgit v1.2.3