aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/particles
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-03-29 15:46:15 +0200
committerQt by Nokia <qt-info@nokia.com>2012-03-30 13:05:31 +0200
commitc6ffcd7e5a30a6a16f32449a94b065aa6c83c6b0 (patch)
treefe8e8ac92f9589263d99e25dc06f746e54a8af0c /src/quick/particles
parent0c86eaf0068024757bc5bda0ced3c4f1ef79e47a (diff)
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>
Diffstat (limited to 'src/quick/particles')
-rw-r--r--src/quick/particles/qquickparticleemitter_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/particles/qquickparticleemitter_p.h b/src/quick/particles/qquickparticleemitter_p.h
index 70adcff34c..eb9e1fd591 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);
}
}