Fix crash when adding a tracked entity to the safe landing code

when it's not been fully set up yet.
This commit is contained in:
Roxanne Skelly 2019-05-21 16:58:49 -07:00
parent 39d32025a3
commit bad421cb59

View file

@ -71,6 +71,11 @@ void SafeLanding::stopEntitySequence() {
void SafeLanding::addTrackedEntity(const EntityItemID& entityID) {
if (_trackingEntities) {
Locker lock(_lock);
if (_entityTreeRenderer.isNull() || _entityTreeRenderer->getTree() == nullptr) {
return;
}
EntityItemPointer entity = _entityTreeRenderer->getTree()->findEntityByID(entityID);
if (entity && !entity->isLocalEntity() && entity->getCreated() < _startTime) {