diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2011-06-14 14:09:30 +1000 |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2011-06-14 14:13:23 +1000 |
commit | 7b22f02961a97c0fa07127ea3ff26b8435a617b8 (patch) | |
tree | fd96799dab3db175a4c87fa00a3548a61fa0b69e /src/declarative/particles/qsgmodelparticle.cpp | |
parent | ba7e87ffe0f1cb356dc31dc2d43640d06309eaa7 (diff) |
Safer cleanup in model/item particle
Diffstat (limited to 'src/declarative/particles/qsgmodelparticle.cpp')
-rw-r--r-- | src/declarative/particles/qsgmodelparticle.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/declarative/particles/qsgmodelparticle.cpp b/src/declarative/particles/qsgmodelparticle.cpp index b0b4fa4ad2..f87c0d31b9 100644 --- a/src/declarative/particles/qsgmodelparticle.cpp +++ b/src/declarative/particles/qsgmodelparticle.cpp @@ -177,21 +177,23 @@ void QSGModelParticle::processPending() foreach(QSGItem* item, m_deletables){ item->setOpacity(0.); m_model->release(item); - m_deletables.removeAll(item); } + m_deletables.clear(); foreach(int pos, m_requests){ - m_items[pos] = m_model->item(m_available.first()); - m_idx[pos] = m_available.first(); - m_available.pop_front(); - QSGModelParticleAttached* mpa = qobject_cast<QSGModelParticleAttached*>(qmlAttachedPropertiesObject<QSGModelParticle>(m_items[pos])); - if(mpa){ - mpa->m_mp = this; - mpa->attach(); + if(!m_available.isEmpty()){ + m_items[pos] = m_model->item(m_available.first()); + m_idx[pos] = m_available.first(); + m_available.pop_front(); + QSGModelParticleAttached* mpa = qobject_cast<QSGModelParticleAttached*>(qmlAttachedPropertiesObject<QSGModelParticle>(m_items[pos])); + if(mpa){ + mpa->m_mp = this; + mpa->attach(); + } + m_items[pos]->setParentItem(this); } - m_items[pos]->setParentItem(this); - m_requests.removeAll(pos); } + m_requests.clear(); } void QSGModelParticle::reload(QSGParticleData* d) |