From b4537b081ff7f7b912ea22b98916ce79e8ffa5dc Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 26 Jun 2015 16:02:47 -0700
Subject: [PATCH] fix clearActions

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

diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 9b33ae8b05..d2ef880d87 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -1426,8 +1426,9 @@ bool EntityItem::clearActions(EntitySimulation* simulation) {
         action->setOwnerEntity(nullptr);
         action->removeFromSimulation(simulation);
     }
+    _actionData = QByteArray();
     _objectActionsLock.unlock();
-    return serializeActionData();
+    return true;
 }
 
 void EntityItem::setActionData(QByteArray actionData) {
@@ -1497,7 +1498,10 @@ bool EntityItem::serializeActionData() {
     _objectActionsLock.lockForRead();
     if (_objectActions.size() == 0) {
         _objectActionsLock.unlock();
+        _objectActionsLock.lockForWrite();
         _actionData = QByteArray();
+        _objectActionsLock.unlock();
+        return true;
     }
 
     QVector<QByteArray> serializedActions;