From 37d85dcc846d429c014e93020386b945d3d5ac25 Mon Sep 17 00:00:00 2001
From: Louise Poubel <louise@openrobotics.org>
Date: Mon, 8 Mar 2021 17:50:32 -0800
Subject: [PATCH] Fix entity tree for large worlds

Signed-off-by: Louise Poubel <louise@openrobotics.org>
---
 src/gui/plugins/entity_tree/EntityTree.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui/plugins/entity_tree/EntityTree.cc b/src/gui/plugins/entity_tree/EntityTree.cc
index 411df5f028..8a0ae74152 100644
--- a/src/gui/plugins/entity_tree/EntityTree.cc
+++ b/src/gui/plugins/entity_tree/EntityTree.cc
@@ -328,7 +328,9 @@ void EntityTree::Update(const UpdateInfo &, EntityComponentManager &_ecm)
           Q_ARG(QString, entityType(_entity, _ecm)));
       return true;
     });
-    this->dataPtr->initialized = true;
+
+    if (this->dataPtr->worldEntity != kNullEntity)
+      this->dataPtr->initialized = true;
   }
   else
   {