mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #9365: Crash when bringing window to front

This commit is contained in:
Matt 2019-06-04 07:02:55 +02:00
parent dd0649dfed
commit d6975a8f23
No known key found for this signature in database
GPG Key ID: 6D4C24A61C93E208
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2/interface/Window.cpp
View File

@ -681,9 +681,6 @@ rct_window* window_bring_to_front(rct_window* w)
auto itSourcePos = window_get_iterator(w);
if (itSourcePos != g_window_list.end())
{
auto wptr = std::move(*itSourcePos);
g_window_list.erase(itSourcePos);
// Insert in front of the first non-stick-to-front window
auto itDestPos = g_window_list.begin();
for (auto it = g_window_list.rbegin(); it != g_window_list.rend(); it++)
@ -696,7 +693,7 @@ rct_window* window_bring_to_front(rct_window* w)
}
}
g_window_list.insert(itDestPos, std::move(wptr));
g_window_list.splice(itDestPos, g_window_list, itSourcePos);
window_invalidate(w);
if (w->x + w->width < 20)