From 38738a69acf023766590859f5e9227f31a15d591 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 11 Mar 2021 14:56:24 +1300
Subject: [PATCH] Fix locking

---
 libraries/avatars/src/AvatarData.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index ea331137a7..9308ccba84 100755
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -3047,11 +3047,13 @@ void AvatarData::clearAvatarEntity(const QUuid& entityID, bool requiresRemovalFr
 }
 
 void AvatarData::clearAvatarEntities() {
-    _avatarEntitiesLock.withReadLock([this] {
-        foreach(auto entityID, _packedAvatarEntityData.keys()) {
-            clearAvatarEntity(entityID);
-        }
+    QList<QUuid> avatarEntityIDs;
+    _avatarEntitiesLock.withReadLock([&] {
+        avatarEntityIDs = _packedAvatarEntityData.keys();
     });
+    for (const auto& entityID : avatarEntityIDs) {
+        clearAvatarEntity(entityID);
+    }
 }
 
 AvatarEntityMap AvatarData::getAvatarEntityData() const {