Overlay: ProfileSessionListener - fix crash in finializeSession

paroj · paroj · commit 7548e058a5c3 · 2024-01-07T23:56:29.000+01:00
diff --git a/Components/Overlay/src/OgreOverlayProfileSessionListener.cpp b/Components/Overlay/src/OgreOverlayProfileSessionListener.cpp
@@ -110,11 +110,10 @@ namespace Ogre
         OverlayContainer* container = dynamic_cast<OverlayContainer*>(mProfileGui);
         if (container)
         {
-            for (const auto& p : container->getChildren())
+            while (!container->getChildren().empty())
             {
-                OverlayElement* element = p.second;
-                OverlayContainer* parent = element->getParent();
-                if (parent) parent->removeChild(element->getName());
+                OverlayElement* element = container->getChildren().cbegin()->second;
+                container->removeChild(element->getName());
                 OverlayManager::getSingleton().destroyOverlayElement(element);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -110,11 +110,10 @@ namespace Ogre`
`110`	`110`	`OverlayContainer* container = dynamic_cast<OverlayContainer*>(mProfileGui);`
`111`	`111`	`if (container)`
`112`	`112`	`{`
`113`		`- for (const auto& p : container->getChildren())`
	`113`	`+ while (!container->getChildren().empty())`
`114`	`114`	`{`
`115`		`- OverlayElement* element = p.second;`
`116`		`- OverlayContainer* parent = element->getParent();`
`117`		`- if (parent) parent->removeChild(element->getName());`
	`115`	`+ OverlayElement* element = container->getChildren().cbegin()->second;`
	`116`	`+ container->removeChild(element->getName());`
`118`	`117`	`OverlayManager::getSingleton().destroyOverlayElement(element);`
`119`	`118`	`}`
`120`	`119`	`}`