Merge branch 'main' of https://github.com/d1str4ught/m2dev-client-src into bugfix/tolower_breaking_utf8

This commit is contained in:
SuntrustDev
2026-02-09 02:48:00 +01:00

View File

@@ -711,18 +711,21 @@ namespace UI
void CWindowManager::__ClearReserveDeleteWindowList() void CWindowManager::__ClearReserveDeleteWindowList()
{ {
while (!m_ReserveDeleteWindowList.empty()) { if (m_ReserveDeleteWindowList.empty())
auto tmp = m_ReserveDeleteWindowList; return;
m_ReserveDeleteWindowList.clear();
std::unordered_set<CWindow*> tmp;
do {
tmp.swap(m_ReserveDeleteWindowList);
for (CWindow* pWin : tmp) { for (CWindow* pWin : tmp) {
#ifdef __WINDOW_LEAK_CHECK__ #ifdef __WINDOW_LEAK_CHECK__
gs_kSet_pkWnd.erase(pWin); gs_kSet_pkWnd.erase(pWin);
#endif #endif
delete pWin; delete pWin;
} }
} tmp.clear();
} } while (!m_ReserveDeleteWindowList.empty());
}
void CWindowManager::Update() void CWindowManager::Update()
{ {