From 18390c87dacd4675b3e0e9deb04b153e57a75591 Mon Sep 17 00:00:00 2001 From: AlessandroSigna Date: Thu, 7 Jan 2016 10:11:02 -0800 Subject: [PATCH] handling NULL pointer --- interface/src/ui/overlays/OverlayPanel.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/interface/src/ui/overlays/OverlayPanel.cpp b/interface/src/ui/overlays/OverlayPanel.cpp index 7c52a9030e..9e82a2507c 100644 --- a/interface/src/ui/overlays/OverlayPanel.cpp +++ b/interface/src/ui/overlays/OverlayPanel.cpp @@ -172,7 +172,10 @@ void OverlayPanel::applyTransformTo(Transform& transform, bool force) { } else if (!_anchorPositionBindEntity.isNull()) { EntityTreePointer entityTree = DependencyManager::get()->getEntityTree(); entityTree->withReadLock([&] { - transform.setTranslation(entityTree->findEntityByID(_anchorPositionBindEntity)->getPosition()); + EntityItemPointer foundEntity = entityTree->findEntityByID(_anchorPositionBindEntity); + if (foundEntity != NULL) { + transform.setTranslation(foundEntity->getPosition()); + } }); } else { transform.setTranslation(getAnchorPosition()); @@ -184,7 +187,10 @@ void OverlayPanel::applyTransformTo(Transform& transform, bool force) { } else if (!_anchorRotationBindEntity.isNull()) { EntityTreePointer entityTree = DependencyManager::get()->getEntityTree(); entityTree->withReadLock([&] { - transform.setRotation(entityTree->findEntityByID(_anchorRotationBindEntity)->getRotation()); + EntityItemPointer foundEntity = entityTree->findEntityByID(_anchorRotationBindEntity); + if (foundEntity != NULL) { + transform.setRotation(foundEntity->getRotation()); + } }); } else { transform.setRotation(getAnchorRotation());