From c22e08f3e8ac3e4a550f0d7f7e4316bd090109dc Mon Sep 17 00:00:00 2001
From: Dante Ruiz <dante@highfidelity.io>
Date: Tue, 1 Aug 2017 19:58:23 +0100
Subject: [PATCH] loacked script engine in EntityEditPacketSender

---
 libraries/entities/src/EntityEditPacketSender.cpp | 1 +
 libraries/entities/src/EntityEditPacketSender.h   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/libraries/entities/src/EntityEditPacketSender.cpp b/libraries/entities/src/EntityEditPacketSender.cpp
index 7845b0d5e3..ee0fcf8218 100644
--- a/libraries/entities/src/EntityEditPacketSender.cpp
+++ b/libraries/entities/src/EntityEditPacketSender.cpp
@@ -54,6 +54,7 @@ void EntityEditPacketSender::queueEditAvatarEntityMessage(PacketType type,
     EntityItemProperties entityProperties = entity->getProperties();
     entityProperties.merge(properties);
 
+    std::lock_guard<std::mutex> lock(_mutex);
     QScriptValue scriptProperties = EntityItemNonDefaultPropertiesToScriptValue(&_scriptEngine, entityProperties);
     QVariant variantProperties = scriptProperties.toVariant();
     QJsonDocument jsonProperties = QJsonDocument::fromVariant(variantProperties);
diff --git a/libraries/entities/src/EntityEditPacketSender.h b/libraries/entities/src/EntityEditPacketSender.h
index 9190a8296a..81efaa865c 100644
--- a/libraries/entities/src/EntityEditPacketSender.h
+++ b/libraries/entities/src/EntityEditPacketSender.h
@@ -14,6 +14,8 @@
 
 #include <OctreeEditPacketSender.h>
 
+#include <mutex>
+
 #include "EntityItem.h"
 #include "AvatarData.h"
 
@@ -49,6 +51,7 @@ private:
                                       EntityItemID entityItemID, const EntityItemProperties& properties);
 
 private:
+    std::mutex _mutex;
     AvatarData* _myAvatar { nullptr };
     QScriptEngine _scriptEngine;
 };