diff options
| author | Bea Lam <bea.lam@nokia.com> | 2012-02-29 15:47:03 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-01 05:43:07 +0100 |
| commit | 318f15e3d379f41c2fd74d1b801586e572f3affd (patch) | |
| tree | dd3d7196fe4c82babd78227d7e3f28f795d24544 /src/quick/items/qquickitemviewtransition.cpp | |
| parent | c4fa565379d82050ec0c114c6cef01474ea506ed (diff) | |
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>
Diffstat (limited to 'src/quick/items/qquickitemviewtransition.cpp')
| -rw-r--r-- | src/quick/items/qquickitemviewtransition.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
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); + } } |