History

Fixing potential access to null object

Brad Davis committed 11 years ago

Commit fd1cfad1 parent 7fecd321 file · +10 −8Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+10−8
@@ -568,15 +568,17 @@ bool EntityScriptingInterface::actionWorker(const QUuid& entityID, · 567 unmodified lines
568 });568 });
569 569
570 // transmit the change570 // transmit the change
571 EntityItemProperties properties;571 if (success) {
572 _entityTree->withReadLock([&] {572 EntityItemProperties properties;
573 properties = entity->getProperties();573 _entityTree->withReadLock([&] {
574 });574 properties = entity->getProperties();
575 });
575 576
576 properties.setActionDataDirty();577 properties.setActionDataDirty();
577 auto now = usecTimestampNow();578 auto now = usecTimestampNow();
578 properties.setLastEdited(now);579 properties.setLastEdited(now);
579 queueEntityMessage(PacketType::EntityEdit, entityID, properties);580 queueEntityMessage(PacketType::EntityEdit, entityID, properties);
581 }
580 582
581 return success;583 return success;
582}584}