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

Fix assert in debug mode in initialise_list_items 

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
Show Stats 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(); _listItems.pop_back();
// Remove empty headings // 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 (listItem.type == LIST_ITEM_TYPE::HEADING)
{ {
if ((it + 1) == _listItems.end() || if (i + 1 == _listItems.size() ||
(it + 1)->type == LIST_ITEM_TYPE::HEADING) _listItems[i + 1].type == LIST_ITEM_TYPE::HEADING)
{ {
_listItems.erase(it); _listItems.erase(_listItems.begin() + i);
it--; i--;
} }
} }
} }