Revert "A fix for delayed hiding of submenus."

[mikachu/openbox.git] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index bbe7038..a0d26ab 100644 (file)
--- 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)) &&
             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);
         {
             ObMenuEntryFrame *u = menu_entry_frame_under(ev->xcrossing.x_root,
                                                          ev->xcrossing.y_root);