Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit 3367ef211494 · 2025-11-22T15:06:41.000Z
b59f414 Small improvement for CGUI_Impl::DestroyElementRecursive
diff --git a/Client/gui/CGUI_Impl.cpp b/Client/gui/CGUI_Impl.cpp
@@ -23,7 +23,11 @@ void CGUI_Impl::DestroyElementRecursive(CGUIElement* pElement)
 
     if (auto* pImpl = dynamic_cast<CGUIElement_Impl*>(pElement))
     {
-        DestroyGuiWindowRecursive(pImpl->GetWindow());
+        CEGUI::Window* pWindow = pImpl->GetWindow();
+        if (pWindow)
+            DestroyGuiWindowRecursive(pWindow);
+        else
+            delete pElement;
         return;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,11 @@ void CGUI_Impl::DestroyElementRecursive(CGUIElement* pElement)`
`23`	`23`
`24`	`24`	`if (auto* pImpl = dynamic_cast<CGUIElement_Impl*>(pElement))`
`25`	`25`	`{`
`26`		`- DestroyGuiWindowRecursive(pImpl->GetWindow());`
	`26`	`+ CEGUI::Window* pWindow = pImpl->GetWindow();`
	`27`	`+ if (pWindow)`
	`28`	`+ DestroyGuiWindowRecursive(pWindow);`
	`29`	`+ else`
	`30`	`+ delete pElement;`
`27`	`31`	`return;`
`28`	`32`	`}`
`29`	`33`