rubenwardy
/
TGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🪲 Removing selected item in ListBox could cause a crash (fixes #76)

0.8
Bruno Van de Velde 2017-09-27 11:42:52 +02:00
parent 854880016f
commit e3b2eb65bc
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/TGUI/Widgets/ListBox.cpp
View File

@ -242,13 +242,6 @@ namespace tgui
if (index >= m_items.size())
return false;
// Remove the item
m_items.erase(m_items.begin() + index);
m_itemIds.erase(m_itemIds.begin() + index);
m_scroll.setMaximum(static_cast<unsigned int>(m_items.size() * m_itemHeight));
setPosition(m_position);
// Keep it simple and forget hover when an item is removed
updateHoveringItem(-1);
@ -256,7 +249,17 @@ namespace tgui
if (m_selectedItem == static_cast<int>(index))
updateSelectedItem(-1);
else if (m_selectedItem > static_cast<int>(index))
updateSelectedItem(m_selectedItem - 1);
{
// Don't call updateSelectedItem here, there should not be no callback and the item hasn't been erased yet so it would point to the wrong place
m_selectedItem = m_selectedItem - 1;
}
// Remove the item
m_items.erase(m_items.begin() + index);
m_itemIds.erase(m_itemIds.begin() + index);
m_scroll.setMaximum(static_cast<unsigned int>(m_items.size() * m_itemHeight));
setPosition(m_position);
return true;
}