diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2011-07-25 14:13:53 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-26 04:40:21 +0200 |
commit | db518399a2422f6dcd8f2a98ec21bce91267afa7 (patch) | |
tree | 2dbf7760801f38e1f49a18d75083945dcbe77a8a /src/declarative/particles | |
parent | 38ddc64ec988d3b4668cbbedfc377cab309a08bb (diff) |
Crash even less
Should not set pointer to zero if we're going to use it again.
Task-number: QTBUG-20407
Change-Id: Iea1ea879bf3fe53e2e8ac8d93648ab28a0fc7b12
Reviewed-on: http://codereview.qt.nokia.com/2064
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/declarative/particles')
-rw-r--r-- | src/declarative/particles/qsgmodelparticle.cpp | 1 | ||||
-rw-r--r-- | src/declarative/particles/qsgparticlesystem.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/particles/qsgmodelparticle.cpp b/src/declarative/particles/qsgmodelparticle.cpp index cb295d6717..1d06a96def 100644 --- a/src/declarative/particles/qsgmodelparticle.cpp +++ b/src/declarative/particles/qsgmodelparticle.cpp @@ -187,7 +187,6 @@ void QSGModelParticle::processPending() m_available << datum->modelIndex; datum->modelIndex = -1; datum->delegate = 0; - datum = 0; m_activeCount--; } diff --git a/src/declarative/particles/qsgparticlesystem.cpp b/src/declarative/particles/qsgparticlesystem.cpp index 98c685f4b2..9ba5c67296 100644 --- a/src/declarative/particles/qsgparticlesystem.cpp +++ b/src/declarative/particles/qsgparticlesystem.cpp @@ -820,6 +820,7 @@ void QSGParticleSystem::emitParticle(QSGParticleData* pd) } void QSGParticleSystem::finishNewDatum(QSGParticleData *pd){ + Q_ASSERT(pd); m_groupData[pd->group]->prepareRecycler(pd); foreach (QSGParticleAffector *a, m_affectors) |