Addendum #2 to f2e93f2

Author: Dutchman101

Client/core/CSettings.cpp

@@ -12,8 +12,6 @@
 #include "StdInc.h"
 #include <algorithm>
 #include <vector>
-#include "../gui/GuiCleanup.h"
-#include "../gui/CGUIElement_Impl.h"
 #include <core/CClientCommands.h>
 #include <game/CGame.h>
 #include <game/CSettings.h>
@@ -1846,18 +1844,8 @@ void CSettings::DestroyGUI()
         return;
     }
 
-    CEGUI::Window* pRootWindow = nullptr;
-    if (CGUIElement_Impl* pWindowImpl = dynamic_cast<CGUIElement_Impl*>(m_pWindow))
-        pRootWindow = pWindowImpl->GetWindow();
-    if (pRootWindow)
-    {
-        // Bottom-up pass that mirrors the CEGUI tree ownership.
-    DestroyGuiWindowRecursive(pRootWindow);
-    }
-    else
-    {
-        SAFE_DELETE(m_pWindow);
-    }
+    g_pCore->GetGUI()->DestroyElementRecursive(m_pWindow);
+    m_pWindow = nullptr;
 
     RemoveAllKeyBindSections();
     m_bBrowserListsChanged = false;

Client/gui/CGUI_Impl.cpp

@@ -15,9 +15,18 @@
 
 using std::list;
 
-void CGUI_Impl::DestroyWindowRecursive(CEGUI::Window* pWindow)
+void CGUI_Impl::DestroyElementRecursive(CGUIElement* pElement)
 {
-    DestroyGuiWindowRecursive(pWindow);
+    if (!pElement)
+        return;
+
+    if (auto* pImpl = dynamic_cast<CGUIElement_Impl*>(pElement))
+    {
+        DestroyGuiWindowRecursive(pImpl->GetWindow());
+        return;
+    }
+
+    delete pElement;
 }
 
 #define CGUI_MTA_DEFAULT_FONT       "tahoma.ttf"        // %WINDIR%/font/<...>

Client/gui/CGUI_Impl.h

@@ -83,8 +83,6 @@ class CGUI_Impl : public CGUI, public CGUITabList
     static CEGUI::String GetUTFString(const char* szInput);
     static CEGUI::String GetUTFString(const std::string& strInput);
     static CEGUI::String GetUTFString(const CEGUI::String& strInput);            // Not defined
-    static void          DestroyWindowRecursive(CEGUI::Window* pWindow);
-
     //
     CGUIMessageBox* CreateMessageBox(const char* szTitle, const char* szMessage, unsigned int uiFlags);
 
@@ -277,6 +275,7 @@ class CGUI_Impl : public CGUI, public CGUITabList
     void RemoveFromRedrawQueue(CGUIElement* pWindow);
 
     void        CleanDeadPool();
+    void        DestroyElementRecursive(CGUIElement* pElement);
     CGUIWindow* LoadLayout(CGUIElement* pParent, const SString& strFilename);
     bool        LoadImageset(const SString& strFilename);
 

Client/sdk/gui/CGUI.h

@@ -166,6 +166,7 @@ class CGUI
     virtual void ClearSystemKeys() = 0;
 
     virtual void CleanDeadPool() = 0;
+    virtual void DestroyElementRecursive(CGUIElement* pElement) = 0;
 
     virtual CGUIWindow* LoadLayout(CGUIElement* pParent, const SString& strFilename) = 0;
     virtual bool        LoadImageset(const SString& strFilename) = 0;