summaryrefslogtreecommitdiff
path: root/openbox/event.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2009-12-22 09:31:24 -0500
committerDana Jansens <danakj@orodu.net>2010-01-05 21:44:39 -0500
commit775f60852a82930e870102a3b3b5a073c3ad6401 (patch)
treee11ba9a5cd93e6b272b914ca82cbd30bc46d68c3 /openbox/event.c
parentc6370aa48a2832eb4f26aa73662326e0fc4dc99f (diff)
Revert "A fix for delayed hiding of submenus."
This reverts commit 1fb198410e9d3ca660d91d1049249db0f2f47732.
Diffstat (limited to 'openbox/event.c')
-rw-r--r--openbox/event.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/openbox/event.c b/openbox/event.c
index bbe7038e..a0d26ab7 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1838,7 +1838,8 @@ static gboolean event_handle_menu(XEvent *ev)
break;
if ((e = g_hash_table_lookup(menu_frame_map, &ev->xcrossing.window)) &&
- (f = find_active_menu()) && f->selected == e)
+ (f = find_active_menu()) && f->selected == e &&
+ e->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU)
{
ObMenuEntryFrame *u = menu_entry_frame_under(ev->xcrossing.x_root,
ev->xcrossing.y_root);