Fix regression: hitting a key accel in a menu didn't move focus to the submenu

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index ba39ef9f562d9844ec8eae01885f17c2239341c9..2dde13299585928cbd62966b0b969c3162312c0c 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1945,8 +1945,15 @@ static gboolean event_handle_menu_input(XEvent *ev)
                 if (found) {
                     menu_frame_select(frame, found, TRUE);
 
-                    if (num_found == 1)
-                        frame->press_doexec = TRUE;
+                    if (num_found == 1) {
+                        if (found->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
+                            /* move focus to the child menu */
+                            menu_frame_select_next(frame->child);
+                        }
+                        else {
+                            frame->press_doexec = TRUE;
+                        }
+                    }
                     ret = TRUE;
                 }
             }