Close menu properly on unbound keys.

2 files changed, 2 insertions, 3 deletions

diff --git a/openbox/event.c b/openbox/event.c
index 5116148c..a42432a8 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1093,7 +1093,7 @@ static void event_handle_menu(ObClient *client, XEvent *e)
 
         /* will call the menu_hide() for each submenu as well */
         if (!it)
-            menu_hide(menu_visible->data);
+            ((ObMenu *)menu_visible->data)->hide(menu_visible->data);
 	
         break;
     case MotionNotify:
diff --git a/openbox/menu.c b/openbox/menu.c
index 0bc820ae..99043cd5 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -581,8 +581,7 @@ void menu_control_keyboard_nav(unsigned int key)
         break;
     }
     default:
-        if (current_menu)
-            current_menu->hide(current_menu);
+        ((ObMenu *)menu_visible->data)->hide(menu_visible->data);
     }
     return;
 }