Synchronize changes from 1.6 branch [ci skip]

f522314 Revert 68a8db6 to curb unknown camera performance regression in 1.6 (Revised changes are planned for 1.7 only)
e17a7a1 Revert "Addendum to 9ff02d5"
737d587 Fix main menu memory leaks
8052d64 Addendum #2 to f2e93f2
6fd9d8b Addendum to f2e93f2 (CSettings leak): Use new cleanup helper
d1f8162 Fix mem leaks in CSettings

Author: github-actions[bot]

Client/core/CMainMenu.cpp

@@ -358,33 +358,64 @@ CMainMenu::CMainMenu(CGUI* pManager)
 
 CMainMenu::~CMainMenu()
 {
-    // Destroy GUI items
-    delete m_pBackground;
-    delete m_pCanvas;
-    delete m_pFiller;
-    delete m_pFiller2;
-    delete m_pLogo;
-    delete m_pLatestNews;
-    delete m_pVersion;
-    delete m_pMenuArea;
-
-    // Destroy the menu items. Note: The disconnect item isn't always in the
-    // list of menu items (it's only in there when we're in game). This means we
-    // don't delete it when we iterate the list and delete it separately - the
-    // menu item itself still exists even when it's no in the list of menu
-    // items. Perhaps there should be a separate list of loaded items really.
-    for (std::deque<sMenuItem*>::iterator it = m_menuItems.begin(); it != m_menuItems.end(); ++it)
+    auto destroyElement = [this](auto*& element) {
+        if (!element)
+            return;
+        m_pManager->DestroyElementRecursive(element);
+        element = nullptr;
+    };
+
+    for (uint i = 0; i < CORE_MTA_NEWS_ITEMS; ++i)
     {
-        if ((*it) != m_pDisconnect)
+        destroyElement(m_pNewsItemLabels[i]);
+        destroyElement(m_pNewsItemShadowLabels[i]);
+        destroyElement(m_pNewsItemDateLabels[i]);
+        destroyElement(m_pNewsItemNEWLabels[i]);
+    }
+
+    for (sMenuItem* pItem : m_menuItems)
+    {
+        if (!pItem || pItem == m_pDisconnect)
+            continue;
+
+        if (pItem->image)
+        {
+            m_pManager->DestroyElementRecursive(pItem->image);
+            pItem->image = nullptr;
+        }
+
+        delete pItem;
+    }
+    m_menuItems.clear();
+    m_unhoveredItems.clear();
+    m_pHoveredItem = nullptr;
+
+    if (m_pDisconnect)
+    {
+        if (m_pDisconnect->image)
         {
-            delete (*it)->image;
-            delete (*it);
+            m_pManager->DestroyElementRecursive(m_pDisconnect->image);
+            m_pDisconnect->image = nullptr;
         }
+
+        delete m_pDisconnect;
+        m_pDisconnect = nullptr;
     }
 
-    delete m_pDisconnect->image;
-    delete m_pDisconnect;
+    destroyElement(m_pMenuArea);
+    destroyElement(m_pLogo);
+    destroyElement(m_pLatestNews);
+    destroyElement(m_pVersion);
+
+    destroyElement(m_pCanvas);
+    destroyElement(m_pBackground);
+    destroyElement(m_pFiller);
+    destroyElement(m_pFiller2);
+
     delete m_pLanguageSelector;
+    m_pLanguageSelector = nullptr;
+    delete m_pNewsBrowser;
+    m_pNewsBrowser = nullptr;
 }
 
 void CMainMenu::SetMenuVerticalPosition(int iPosY)