#5623: Fix crashing the EntityInspector when a non-entity is selected…

… below the root node
codereader · May 28, 2021 · 756bdda · 756bdda
1 parent 130b1e9
commit 756bdda
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/radiant/ui/einspector/EntityInspector.cpp b/radiant/ui/einspector/EntityInspector.cpp
@@ -1194,6 +1194,11 @@ void EntityInspector::getEntityFromSelectionSystem()
         scene::INodePtr selectedNodeParent = selectedNode->getParent();
         changeSelectedEntity(selectedNodeParent);
 
+        if (!_selectedEntity.lock())
+        {
+            return;
+        }
+
         try
         {
             auto indices = scene::getNodeIndices(selectedNode);
@@ -1243,7 +1248,7 @@ void EntityInspector::changeSelectedEntity(const scene::INodePtr& newEntity)
     _keyValueTreeView->ResetSortingOnAllColumns();
 
     // Attach to new entity if it is non-NULL
-    if (newEntity)
+    if (newEntity && newEntity->getNodeType() == scene::INode::Type::Entity)
     {
         _selectedEntity = newEntity;