From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 29 Mar 2012 13:46:15 +0000 (+0200)
Subject: Fix exit crash when running samegame-desktop in qmlscene.
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=c6ffcd7e5a30a6a16f32449a94b065aa6c83c6b0;p=konrad%2Fqtdeclarative.git

Fix exit crash when running samegame-desktop in qmlscene.

Change-Id: Ib4c162a909eb45e99a7e5c31737587720e9e2deb
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
---

diff --git a/src/quick/particles/qquickparticleemitter_p.h b/src/quick/particles/qquickparticleemitter_p.h
index 70adcff..eb9e1fd 100644
--- a/src/quick/particles/qquickparticleemitter_p.h
+++ b/src/quick/particles/qquickparticleemitter_p.h
@@ -178,7 +178,8 @@ public slots:
     {
         if (m_system != arg) {
             m_system = arg;
-            m_system->registerParticleEmitter(this);
+            if (m_system)
+                m_system->registerParticleEmitter(this);
             emit systemChanged(arg);
         }
     }