#6158: Fix crash due to race condition in EntityPreview

codereader · codereader · commit f2fc5089fe8b · 2022-11-12T16:00:21.000+01:00
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();

Original file line number	Diff line number	Diff line change
`@@ -33,14 +33,15 @@ void EntityPreview::setEntity(const IEntityNodePtr& entity)`
`33`	`33`
`34`	`34`	`if (_entity)`
`35`	`35`	`{`
`36`		`- _rootNode->removeChildNode(_entity);`
	`36`	`+ // Use getScene to access the root node to ensure it's created`
	`37`	`+ getScene()->root()->removeChildNode(_entity);`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`_entity = entity;`
`40`	`41`
`41`	`42`	`if (_entity)`
`42`	`43`	`{`
`43`		`- _rootNode->addChildNode(_entity);`
	`44`	`+ getScene()->root()->addChildNode(_entity);`
`44`	`45`
`45`	`46`	`// Remember the entity bounds including children`
`46`	`47`	`_untransformedEntityBounds = _entity->worldAABB();`