Merge pull request #15623 from AndrewMeadows/plug-otherAvatar-resource-leak

BUGZ 345: avoid resource leak in AvatarManger::_otherAvatarsToChangeInPhysics
This commit is contained in:
Anthony Thibault 2019-05-23 14:51:29 -07:00 committed by GitHub
commit fecd488b4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -521,6 +521,7 @@ void AvatarManager::buildPhysicsTransaction(PhysicsEngine::Transaction& transact
}
}
}
_otherAvatarsToChangeInPhysics.clear();
}
void AvatarManager::handleProcessedPhysicsTransaction(PhysicsEngine::Transaction& transaction) {
@ -645,7 +646,7 @@ void AvatarManager::clearOtherAvatars() {
}
void AvatarManager::deleteAllAvatars() {
assert(_otherAvatarsToChangeInPhysics.empty());
_otherAvatarsToChangeInPhysics.clear();
QReadLocker locker(&_hashLock);
AvatarHash::iterator avatarIterator = _avatarHash.begin();
while (avatarIterator != _avatarHash.end()) {