From f00aa15096dd1d65388fe4ce841798c256df85b1 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sat, 10 Mar 2018 10:52:32 +0000 Subject: [PATCH] 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. --- src/openrct2-ui/windows/TitleScenarioSelect.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/openrct2-ui/windows/TitleScenarioSelect.cpp b/src/openrct2-ui/windows/TitleScenarioSelect.cpp index 5cc2f9d392..f5aa6da9bf 100644 --- a/src/openrct2-ui/windows/TitleScenarioSelect.cpp +++ b/src/openrct2-ui/windows/TitleScenarioSelect.cpp @@ -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--; } } }