summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2009-12-21 10:43:38 -0500
committerDana Jansens <danakj@orodu.net>2009-12-21 10:43:38 -0500
commita03b817aeb7fe32be881c30d50fab79455db08c5 (patch)
tree0c3fffbd7ecd565cf1bfbf66be04e00563a3463f /openbox
parentb7393636e05c95ec068e8a1ff063cbefa63a901b (diff)
parent6d8b7bd5f7ede1803c1259f5c1b760e5dbf4dbe3 (diff)
Merge branch 'backport' into work
Diffstat (limited to 'openbox')
-rw-r--r--openbox/event.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/openbox/event.c b/openbox/event.c
index 1b7b7739..2f853fbb 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1926,8 +1926,7 @@ static void event_handle_menu(ObMenuFrame *frame, XEvent *ev)
break;
if ((e = g_hash_table_lookup(menu_frame_map, &ev->xcrossing.window)) &&
- (f = find_active_menu()) && f->selected == e &&
- e->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU)
+ (f = find_active_menu()) && f->selected == e)
{
ObMenuEntryFrame *u = menu_entry_frame_under(ev->xcrossing.x_root,
ev->xcrossing.y_root);