mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Fix flaw in BringToFront using the wrong iterator, ignore dead ones

Browse Source
This commit is contained in:
ζeh Matt
2025-05-16 16:10:47 +03:00
parent c37327a9c9
commit e3fb47cf98
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2-ui/WindowManager.cpp
View File

@@ -1321,14 +1321,22 @@ public:
for (auto it = g_window_list.rbegin(); it != g_window_list.rend(); it++)
{
auto& w2 = *it;
if (w2->flags & WF_DEAD)
{
continue;
}
if (!(w2->flags & WF_STICK_TO_FRONT))
{
itDestPos = it.base();
// base() returns the next element in the list, so we need to decrement it.
itDestPos = std::prev(it.base());
break;
}
}
std::iter_swap(itSourcePos, itDestPos);
if (itSourcePos != itDestPos)
{
std::iter_swap(itSourcePos, itDestPos);
}
w.Invalidate();
if (w.windowPos.x + w.width < 20)