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
837837 bool result = modelEntity->setAbsoluteJointTranslationInObjectFrame(jointIndex, translation);
838838 if (result) {
839839 EntityItemProperties properties;
840− _entityTree->withReadLock([&] {
840+ _entityTree->withWriteLock([&] {
841841 properties = entity->getProperties();
842− entity->setLastEdited(now);
843842 entity->setLastBroadcast(now);
844843 });
845844
@@ -860,9 +859,8 @@ bool EntityScriptingInterface::setAbsoluteJointRotationInObjectFrame(const QUuid · 14 unmodified lines
860859 bool result = modelEntity->setAbsoluteJointRotationInObjectFrame(jointIndex, rotation);
861860 if (result) {
862861 EntityItemProperties properties;
863− _entityTree->withReadLock([&] {
862+ _entityTree->withWriteLock([&] {
864863 properties = entity->getProperties();
865− entity->setLastEdited(now);
866864 entity->setLastBroadcast(now);
867865 });
868866