Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 12:04:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

When importing entities from JSON: fixed a null pointer exception if addEntity() failed on any of the entities

Browse source
This commit is contained in:
Oren Hurvitz 2018-04-17 12:32:28 +03:00
parent 4c0a0a84fa
commit 91e27db9b0
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/entities/src/EntityTree.cpp
View file

@ -2282,7 +2282,10 @@ bool EntityTree::sendEntitiesOperation(const OctreeElementPointer& element, void
if (args->otherTree) {
args->otherTree->withWriteLock([&] {
EntityItemPointer entity = args->otherTree->addEntity(newID, properties);
entity->deserializeActions();
if (entity) {
entity->deserializeActions();
}
// else: there was an error adding this entity
});
}
return newID;