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

Merge pull request #6725 from huffman/fix-avatar-get-myavatar

Browse source 
Fix crash when getting MyAvatar.sessionUUID from AvatarManager
This commit is contained in:
Andrew Meadows 2015-12-30 08:41:52 -08:00
commit b83987331b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/AvatarManager.cpp
View file

@ -310,8 +310,8 @@ QVector<QUuid> AvatarManager::getAvatarIdentifiers() {
} }
AvatarData* AvatarManager::getAvatar(QUuid avatarID) { AvatarData* AvatarManager::getAvatar(QUuid avatarID) {
QReadLocker locker(&_hashLock); // Null/Default-constructed QUuids will return MyAvatar
return _avatarHash[avatarID].get(); // Non-obvious: A bogus avatarID answers your own avatar. return getAvatarBySessionID(avatarID).get();
} }