Check item before notifying transition has finished

Fixes crash when using SmoothedAnimation with view transitions

Change-Id: Ib9a201e417c34d64f8144a616e75cae8b67568e2
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>

diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp
index 0f092b7..ea81e14 100644 (file)
--- 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);
+    }
 }