History

fix locking

Seth Alves committed 10 years ago

Commit 2147b0d1 parent c9ed36f1 file · +2 −4Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 1 file). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+2−4
@@ -837,9 +837,8 @@ bool EntityScriptingInterface::setAbsoluteJointTranslationInObjectFrame(const QU · 836 unmodified lines
837 bool result = modelEntity->setAbsoluteJointTranslationInObjectFrame(jointIndex, translation);837 bool result = modelEntity->setAbsoluteJointTranslationInObjectFrame(jointIndex, translation);
838 if (result) {838 if (result) {
839 EntityItemProperties properties;839 EntityItemProperties properties;
840 _entityTree->withReadLock([&] {840 _entityTree->withWriteLock([&] {
841 properties = entity->getProperties();841 properties = entity->getProperties();
842 entity->setLastEdited(now);
843 entity->setLastBroadcast(now);842 entity->setLastBroadcast(now);
844 });843 });
845 844
@@ -860,9 +859,8 @@ bool EntityScriptingInterface::setAbsoluteJointRotationInObjectFrame(const QUuid · 14 unmodified lines
860 bool result = modelEntity->setAbsoluteJointRotationInObjectFrame(jointIndex, rotation);859 bool result = modelEntity->setAbsoluteJointRotationInObjectFrame(jointIndex, rotation);
861 if (result) {860 if (result) {
862 EntityItemProperties properties;861 EntityItemProperties properties;
863 _entityTree->withReadLock([&] {862 _entityTree->withWriteLock([&] {
864 properties = entity->getProperties();863 properties = entity->getProperties();
865 entity->setLastEdited(now);
866 entity->setLastBroadcast(now);864 entity->setLastBroadcast(now);
867 });865 });
868 866