From ddbb7a4416737ea40889d7915057180f7053c1cc Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Mon, 18 Dec 2017 14:26:25 -0800
Subject: [PATCH] when an avatar-entity's lifetime expires, remove it from
 avatarEntityData

---
 interface/src/Application.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index f76116b6ad..e93a17553e 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1496,6 +1496,14 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         }
     });
 
+    connect(getEntities()->getTree().get(), &EntityTree::deletingEntity, [=](const EntityItemID& entityItemID) {
+        auto avatarManager = DependencyManager::get<AvatarManager>();
+        auto myAvatar = avatarManager ? avatarManager->getMyAvatar() : nullptr;
+        if (myAvatar) {
+            myAvatar->clearAvatarEntity(entityItemID);
+        }
+    });
+
     // Keyboard focus handling for Web overlays.
     auto overlays = &(qApp->getOverlays());
     connect(overlays, &Overlays::overlayDeleted, [=](const OverlayID& overlayID) {