From 2b0285adc2fdf50fa9e70827e61bc7dead647958 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 20 Oct 2017 15:05:21 -0700
Subject: [PATCH] fix action (grab) deadlock

---
 libraries/entities/src/EntityItem.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 9af39254ed..2d3aeeba38 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -2109,6 +2109,7 @@ bool EntityItem::addAction(EntitySimulationPointer simulation, EntityDynamicPoin
             removeActionInternal(action->getID());
         }
     });
+    updateQueryAACube();
 
     return result;
 }
@@ -2167,6 +2168,8 @@ bool EntityItem::removeAction(EntitySimulationPointer simulation, const QUuid& a
         checkWaitingToRemove(simulation);
         success = removeActionInternal(actionID);
     });
+    updateQueryAACube();
+
     return success;
 }
 
@@ -2194,7 +2197,6 @@ bool EntityItem::removeActionInternal(const QUuid& actionID, EntitySimulationPoi
         _dirtyFlags |= Simulation::DIRTY_PHYSICS_ACTIVATION;
         _dirtyFlags |= Simulation::DIRTY_COLLISION_GROUP; // may need to not collide with own avatar
         setDynamicDataNeedsTransmit(true);
-        updateQueryAACube();
         return success;
     }
     return false;