From 45406177e517bbadd1e20c455aa2bc9c261ef743 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 17 Jan 2018 17:56:25 -0800
Subject: [PATCH] avoid a deadlock when clearing avatar entities

---
 .../avatars-renderer/src/avatars-renderer/Avatar.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 0f9573bb84..95a8a9f1fd 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -328,13 +328,15 @@ void Avatar::updateAvatarEntities() {
         AvatarEntityIDs recentlyDettachedAvatarEntities = getAndClearRecentlyDetachedIDs();
         if (!recentlyDettachedAvatarEntities.empty()) {
             // only lock this thread when absolutely necessary
+            AvatarEntityMap avatarEntityData;
             _avatarEntitiesLock.withReadLock([&] {
-                foreach (auto entityID, recentlyDettachedAvatarEntities) {
-                    if (!_avatarEntityData.contains(entityID)) {
-                        entityTree->deleteEntity(entityID, true, true);
-                    }
-                }
+                avatarEntityData = _avatarEntityData;
             });
+            foreach (auto entityID, recentlyDettachedAvatarEntities) {
+                if (!avatarEntityData.contains(entityID)) {
+                    entityTree->deleteEntity(entityID, true, true);
+                }
+            }
 
             // remove stale data hashes
             foreach (auto entityID, recentlyDettachedAvatarEntities) {