Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 18:13:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1650 from ZappoMan/bugfixes

Browse source 
Fix crash in particle server
This commit is contained in:
Philip Rosedale 2014-01-23 10:50:13 -08:00
commit f4dafa9057
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/particles/src/ParticleTree.cpp
View file

@ -390,17 +390,20 @@ bool ParticleTree::encodeParticlesDeletedSince(uint64_t& sinceTime, unsigned cha
// called by the server when it knows all nodes have been sent deleted packets // called by the server when it knows all nodes have been sent deleted packets
void ParticleTree::forgetParticlesDeletedBefore(uint64_t sinceTime) { void ParticleTree::forgetParticlesDeletedBefore(uint64_t sinceTime) {
//qDebug() << "forgetParticlesDeletedBefore()";
_recentlyDeletedParticlesLock.lockForWrite(); _recentlyDeletedParticlesLock.lockForWrite();
QMultiMap<uint64_t, uint32_t>::const_iterator iterator = _recentlyDeletedParticleIDs.constBegin(); QMultiMap<uint64_t, uint32_t>::iterator iterator = _recentlyDeletedParticleIDs.begin();
while (iterator != _recentlyDeletedParticleIDs.constEnd()) { while (iterator != _recentlyDeletedParticleIDs.end()) {
//qDebug() << "considering... time/key:" << iterator.key(); //qDebug() << "considering... time/key:" << iterator.key();
if (iterator.key() <= sinceTime) { if (iterator.key() <= sinceTime) {
//qDebug() << "YES older... time/key:" << iterator.key(); //qDebug() << "YES older... time/key:" << iterator.key();
_recentlyDeletedParticleIDs.remove(iterator.key()); _recentlyDeletedParticleIDs.remove(iterator.key());
} }
//qDebug() << "about to ++iterator";
++iterator; ++iterator;
} }
_recentlyDeletedParticlesLock.unlock(); _recentlyDeletedParticlesLock.unlock();
//qDebug() << "DONE forgetParticlesDeletedBefore()";
} }