From: Alan Alpert <alan.alpert@nokia.com>
Date: Mon, 4 Jul 2011 04:51:24 +0000 (+1000)
Subject: Avoid crash on exit
X-Git-Tag: qt-v5.0.0-alpha1~2155
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=87822d24df32311a50dc87ded55ad4d17e8226f0;p=profile%2Fivi%2Fqtdeclarative.git

Avoid crash on exit

QSParticlePainter could call QSGItem::mapFromItem while the scene was
being destroyed.

Change-Id: If9356dae6aadf97b853c2aaf51870751bbbab711
Reviewed-on: http://codereview.qt.nokia.com/1023
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones
---

diff --git a/src/declarative/particles/qsgparticlepainter.cpp b/src/declarative/particles/qsgparticlepainter.cpp
index cf1d3c2..34313bd 100644
--- a/src/declarative/particles/qsgparticlepainter.cpp
+++ b/src/declarative/particles/qsgparticlepainter.cpp
@@ -172,7 +172,7 @@ int QSGParticlePainter::particleTypeIndex(QSGParticleData* d)
 
 void QSGParticlePainter::calcSystemOffset()
 {
-    if(!m_system)
+    if (!m_system || !parentItem())
         return;
     QPointF lastOffset = m_systemOffset;
     m_systemOffset = -1 * this->mapFromItem(m_system, QPointF());