#6158: Fix crash due to race condition in EntityPreview

codereader · Nov 12, 2022 · f2fc508 · f2fc508
1 parent 398e3be
commit f2fc508
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/libs/wxutil/preview/EntityPreview.cpp b/libs/wxutil/preview/EntityPreview.cpp
@@ -33,14 +33,15 @@ void EntityPreview::setEntity(const IEntityNodePtr& entity)
 
     if (_entity)
     {
-        _rootNode->removeChildNode(_entity);
+        // Use getScene to access the root node to ensure it's created
+        getScene()->root()->removeChildNode(_entity);
     }
 
     _entity = entity;
 
     if (_entity)
     {
-        _rootNode->addChildNode(_entity);
+        getScene()->root()->addChildNode(_entity);
 
         // Remember the entity bounds including children
         _untransformedEntityBounds = _entity->worldAABB();