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

Merge pull request #15603 from roxanneskelly/bugz223

Browse source 
BUGZ-223 - Fix crash when adding a tracked entity to the safe landing code
This commit is contained in:
Shannon Romano 2019-05-21 19:38:01 -07:00 committed by GitHub
commit 930018a924
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/octree/SafeLanding.cpp
View file

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