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 assert in debug mode in initialise_list_items

Browse Source 
Erasing vector iterators causes the iterator to become invalid, so use an index instead for the loop.
This commit is contained in:
Ted John
2018-03-10 10:52:32 +00:00
parent 4bfeaf0c72
commit f00aa15096
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2-ui/windows/TitleScenarioSelect.cpp
View File

@@ -681,16 +681,16 @@ static void initialise_list_items(rct_window *w)
_listItems.pop_back();
// Remove empty headings
for (auto it = _listItems.begin(); it != _listItems.end(); it++)
for (size_t i = 0; i < _listItems.size(); i++)
{
const auto &listItem = *it;
const auto &listItem = _listItems[i];
if (listItem.type == LIST_ITEM_TYPE::HEADING)
{
if ((it + 1) == _listItems.end() ||
(it + 1)->type == LIST_ITEM_TYPE::HEADING)
if (i + 1 == _listItems.size() ||
_listItems[i + 1].type == LIST_ITEM_TYPE::HEADING)
{
_listItems.erase(it);
it--;
_listItems.erase(_listItems.begin() + i);
i--;
}
}
}