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

Merge pull request #12918 from kitely/fix-addentity-failure

Browse source 
Fixed null pointer exception if importing an entity from JSON fails
This commit is contained in:
Seth Alves 2018-04-21 18:12:48 -07:00 committed by GitHub
commit 9e1bd69af3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -2285,7 +2285,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;