Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 16:14:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #11873 from sethalves/fix-wearable-domain-change-crash

Browse source 
avoid a crash during domain change while wearing something
This commit is contained in:
Brad Hefta-Gaub 2017-11-27 13:01:48 -08:00 committed by GitHub
commit 6d6ac0a5a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities/src/EntityItem.cpp
View file

@ -1602,7 +1602,7 @@ void EntityItem::setParentID(const QUuid& value) {
QUuid oldParentID = getParentID(); QUuid oldParentID = getParentID();
if (oldParentID != value) { if (oldParentID != value) {
EntityTreePointer tree = getTree(); EntityTreePointer tree = getTree();
if (!oldParentID.isNull()) { if (tree && !oldParentID.isNull()) {
tree->removeFromChildrenOfAvatars(getThisPointer()); tree->removeFromChildrenOfAvatars(getThisPointer());
} }
SpatiallyNestable::setParentID(value); SpatiallyNestable::setParentID(value);