xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix crashes when cycling through menu with an active filter

Browse Source
This commit is contained in:
Maxime Coste 2012-10-29 19:17:37 +01:00
parent 254d43856d
commit 945f54daea
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/input_handler.cc
View File

@ -183,7 +183,7 @@ public:
{ {
auto it = std::find_if(m_selected+1, m_choices.end(), match_filter); auto it = std::find_if(m_selected+1, m_choices.end(), match_filter);
if (it == m_choices.end()) if (it == m_choices.end())
it = std::find_if(m_choices.begin(), m_selected+1, match_filter); it = std::find_if(m_choices.begin(), m_selected, match_filter);
m_selected = it; m_selected = it;
context.ui().menu_select(m_selected - m_choices.begin()); context.ui().menu_select(m_selected - m_choices.begin());
} }
@ -192,8 +192,8 @@ public:
key == Key(Key::Modifiers::Control, 'p') or key == Key(Key::Modifiers::Control, 'p') or
key == Key(Key::Modifiers::None, 'k')) key == Key(Key::Modifiers::None, 'k'))
{ {
ChoiceList::const_reverse_iterator selected(m_selected); ChoiceList::const_reverse_iterator selected(m_selected+1);
auto it = std::find_if(selected, m_choices.rend(), match_filter); auto it = std::find_if(selected+1, m_choices.rend(), match_filter);
if (it == m_choices.rend()) if (it == m_choices.rend())
it = std::find_if(m_choices.rbegin(), selected, match_filter); it = std::find_if(m_choices.rbegin(), selected, match_filter);
m_selected = it.base()-1; m_selected = it.base()-1;