Close menu properly on unbound keys.

diff --git a/openbox/event.c b/openbox/event.c
index 5116148cd3021604b85c797ac91f206bdcfaeb71..a42432a87f4bba68de58fbef584f5beafb3ab897 100644 (file)
--- 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 0bc820aefd358bc62b84e66b431533e1a0308736..99043cd52caeca139a0084999e6fab6fc9977a59 100644 (file)
--- 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;
 }