diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-03-02 04:18:17 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-03-02 04:19:05 -0500 |
| commit | 37705f444eecabb2e5bd31e92bc8b82ae9b8b596 (patch) | |
| tree | 6c2ef624542f53985773b3399ca49baacbbf7d77 /openbox/event.c | |
| parent | a47d0a53652a96ca1df96fc9268757df1431ae55 (diff) | |
| parent | e8ce4dbb8fa8f415759745d57bb1c971ea360ec5 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/actions/all.h
openbox/event.c
openbox/prompt.c
Diffstat (limited to 'openbox/event.c')
| -rw-r--r-- | openbox/event.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/openbox/event.c b/openbox/event.c index 2563be2b..d1c345ab 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -1726,7 +1726,8 @@ static gboolean event_handle_menu_input(XEvent *ev) else if (keycode == ob_keycode(OB_KEY_LEFT)) { /* Left goes to the parent menu */ - menu_frame_select(frame, NULL, TRUE); + if (frame->parent) + menu_frame_select(frame, NULL, TRUE); ret = TRUE; } |