From 1ea0dba083a023f9ca0488caf08cfe251f2fa472 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Thu, 20 Jun 2019 09:29:12 -0700
Subject: [PATCH] use weak_ptr for fade-out-finished lambda

---
 .../entities-renderer/src/EntityTreeRenderer.cpp     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index 8671b3da7e..5ac6e4f642 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -1066,10 +1066,14 @@ void EntityTreeRenderer::fadeOutRenderable(const EntityRendererPointer& renderab
     render::Transaction transaction;
     auto scene = _viewState->getMain3DScene();
 
-    transaction.setTransitionFinishedOperator(renderable->getRenderItemID(), [scene, renderable]() {
-        render::Transaction transaction;
-        renderable->removeFromScene(scene, transaction);
-        scene->enqueueTransaction(transaction);
+    EntityRendererWeakPointer weakRenderable = renderable;
+    transaction.setTransitionFinishedOperator(renderable->getRenderItemID(), [scene, weakRenderable]() {
+        auto renderable = weakRenderable.lock();
+        if (renderable) {
+            render::Transaction transaction;
+            renderable->removeFromScene(scene, transaction);
+            scene->enqueueTransaction(transaction);
+        }
     });
 
     scene->enqueueTransaction(transaction);