From: Dana Jansens <danakj@orodu.net>
Date: Tue, 22 Dec 2009 14:31:24 +0000 (-0500)
Subject: Revert "A fix for delayed hiding of submenus."
X-Git-Tag: release-3.4.10~2^2~9
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=775f60852a82930e870102a3b3b5a073c3ad6401

Revert "A fix for delayed hiding of submenus."

This reverts commit 1fb198410e9d3ca660d91d1049249db0f2f47732.
---

diff --git a/openbox/event.c b/openbox/event.c
index bbe7038..a0d26ab 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);