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

Merge pull request #9362 from Broxzier/bugfix/9360-window-freeze 

Fix #9360: sticky windows can be closed
This commit is contained in:
ζeh Matt 2019-06-04 07:20:35 +02:00 committed by GitHub
parent dd0649dfed 4dea507e50
commit 1075536d01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -363,12 +363,14 @@ void window_close_all()
{
window_close_by_class(WC_DROPDOWN);
auto it = g_window_list.begin();
while (it != g_window_list.end())
for (auto it = g_window_list.begin(); it != g_window_list.end();)
{
auto itNext = std::next(it);
auto w = it->get();
window_close(w);
if (!(w->flags & (WF_STICK_TO_BACK | WF_STICK_TO_FRONT)))
{
window_close(w);
}
it = itNext;
}
}