From d50904dd4a209c0da209095133a336b7118d4362 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Fri, 15 Feb 2019 17:08:24 -0800
Subject: [PATCH] fix avatar deadlock

---
 libraries/avatars/src/AvatarHashMap.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp
index 5f30d98ed6..c16d65506a 100644
--- a/libraries/avatars/src/AvatarHashMap.cpp
+++ b/libraries/avatars/src/AvatarHashMap.cpp
@@ -208,16 +208,16 @@ AvatarSharedPointer AvatarHashMap::addAvatar(const QUuid& sessionUUID, const QWe
     avatar->setSessionUUID(sessionUUID);
     avatar->setOwningAvatarMixer(mixerWeakPointer);
 
-    // addAvatar is only called from newOrExistingAvatar, which already locks _hashLock
-    _avatarHash.insert(sessionUUID, avatar);
+    {
+        QWriteLocker locker(&_hashLock);
+        _avatarHash.insert(sessionUUID, avatar);
+    }
     emit avatarAddedEvent(sessionUUID);
     return avatar;
 }
 
-AvatarSharedPointer AvatarHashMap::newOrExistingAvatar(const QUuid& sessionUUID, const QWeakPointer<Node>& mixerWeakPointer,
-    bool& isNew) {
-    QWriteLocker locker(&_hashLock);
-    auto avatar = _avatarHash.value(sessionUUID);
+AvatarSharedPointer AvatarHashMap::newOrExistingAvatar(const QUuid& sessionUUID, const QWeakPointer<Node>& mixerWeakPointer, bool& isNew) {
+    auto avatar = findAvatar(sessionUUID);
     if (!avatar) {
         avatar = addAvatar(sessionUUID, mixerWeakPointer);
         isNew = true;