Merge branch 'master' into to_push

1 files changed, 4 insertions, 1 deletions

diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index ff57bde..ec60b24 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -243,6 +243,8 @@ int Menu::remove(unsigned int index) {
     MenuItem *item = (*it);
 
     if (item) {
+        if (!m_matches.empty())
+            resetTypeAhead();
         menuitems.erase(it);
         // avoid O(n^2) algorithm with removeAll()
         if (index != menuitems.size())
@@ -511,6 +513,7 @@ void Menu::show() {
         updateMenu();
 
     m_type_ahead.reset();
+    m_matches.clear();
 
     menu.window.showSubwindows();
     menu.window.show();
@@ -1300,4 +1303,4 @@ void Menu::hideShownMenu() {
         shown->hide();
 }
 
-}; // end namespace FbTk
+} // end namespace FbTk