dont ungrab twice when hiding menus

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 8d1380d48d6ff0f23b5f20f7a9ac399cf922c2d9..04e651451dad1a7d9ea86acae5d1463521c031a3 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1200,8 +1200,8 @@ static void event_handle_menu(XEvent *ev)
                 menu_frame_select(f, NULL);
         } else if (ev->xkey.keycode == ob_keycode(OB_KEY_RIGHT)) {
             ObMenuFrame *f;
-            if ((f = find_active_menu()) && f->child && f->child->entries)
-                menu_frame_select(f->child, f->child->entries->data);
+            if ((f = find_active_menu()) && f->child)
+                menu_frame_select_next(f->child);
         } else if (ev->xkey.keycode == ob_keycode(OB_KEY_UP)) {
             ObMenuFrame *f;
             if ((f = find_active_menu()))
@@ -1211,5 +1211,6 @@ static void event_handle_menu(XEvent *ev)
             if ((f = find_active_menu()))
                 menu_frame_select_next(f);
         }
+        break;
     }
 }