From 55975fd61177264adfc7194d0a1b4a3b30cf88bd Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Mon, 22 Jun 2015 13:11:42 -0700
Subject: [PATCH] don't add an action of we're about to remove it

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

diff --git a/libraries/physics/src/PhysicalEntitySimulation.cpp b/libraries/physics/src/PhysicalEntitySimulation.cpp
index 506e5fb67e..3719d7f082 100644
--- a/libraries/physics/src/PhysicalEntitySimulation.cpp
+++ b/libraries/physics/src/PhysicalEntitySimulation.cpp
@@ -239,7 +239,9 @@ void PhysicalEntitySimulation::applyActionChanges() {
     if (_physicsEngine) {
         lock();
         foreach (EntityActionPointer actionToAdd, _actionsToAdd) {
-            _physicsEngine->addAction(actionToAdd);
+            if (!_actionsToRemove.contains(actionToAdd->getID())) {
+                _physicsEngine->addAction(actionToAdd);
+            }
         }
         _actionsToAdd.clear();
         foreach (QUuid actionToRemove, _actionsToRemove) {