From 2147b0d78ee68cbfee7829cecf3d5de412f83779 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 4 Jan 2016 12:31:58 -0800 Subject: [PATCH] fix locking --- libraries/entities/src/EntityScriptingInterface.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp index 10f74ef5cc..4904d7ae51 100644 --- a/libraries/entities/src/EntityScriptingInterface.cpp +++ b/libraries/entities/src/EntityScriptingInterface.cpp @@ -837,9 +837,8 @@ bool EntityScriptingInterface::setAbsoluteJointTranslationInObjectFrame(const QU bool result = modelEntity->setAbsoluteJointTranslationInObjectFrame(jointIndex, translation); if (result) { EntityItemProperties properties; - _entityTree->withReadLock([&] { + _entityTree->withWriteLock([&] { properties = entity->getProperties(); - entity->setLastEdited(now); entity->setLastBroadcast(now); }); @@ -860,9 +859,8 @@ bool EntityScriptingInterface::setAbsoluteJointRotationInObjectFrame(const QUuid bool result = modelEntity->setAbsoluteJointRotationInObjectFrame(jointIndex, rotation); if (result) { EntityItemProperties properties; - _entityTree->withReadLock([&] { + _entityTree->withWriteLock([&] { properties = entity->getProperties(); - entity->setLastEdited(now); entity->setLastBroadcast(now); });