Fixing potential access to null object

This commit is contained in:
Brad Davis 2015-09-11 12:02:57 -07:00
parent 7fecd3261d
commit fd1cfadc47

View file

@ -568,15 +568,17 @@ bool EntityScriptingInterface::actionWorker(const QUuid& entityID,
});
// transmit the change
EntityItemProperties properties;
_entityTree->withReadLock([&] {
properties = entity->getProperties();
});
if (success) {
EntityItemProperties properties;
_entityTree->withReadLock([&] {
properties = entity->getProperties();
});
properties.setActionDataDirty();
auto now = usecTimestampNow();
properties.setLastEdited(now);
queueEntityMessage(PacketType::EntityEdit, entityID, properties);
properties.setActionDataDirty();
auto now = usecTimestampNow();
properties.setLastEdited(now);
queueEntityMessage(PacketType::EntityEdit, entityID, properties);
}
return success;
}