dont lose the menu selection while puttin the mouse over a separator (properly)

[chaz/openbox] / openbox / menuframe.c

diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 7052296e14fadec50bd60e50e3fb79f2413cf49e..e27bde0169ed9e8644bfef2f54dc9c8cf90e55c1 100644 (file)
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -617,12 +617,12 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry)
     ObMenuEntryFrame *old = self->selected;
     ObMenuFrame *oldchild = self->child;
 
+    if (entry && entry->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR)
+        entry = old;
+
     if (old == entry) return;
 
-    if (entry && entry->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR)
-        self->selected = entry;
-    else
-        self->selected = NULL;
+    self->selected = entry;
 
     if (old)
         menu_entry_frame_render(old);
@@ -667,7 +667,8 @@ void menu_entry_frame_execute(ObMenuEntryFrame *self, gboolean hide)
         ObClient *client = self->frame->client;
 
         /* release grabs before executing the shit */
-        menu_frame_hide_all();
+        if (hide)
+            menu_frame_hide_all();
 
         if (func)
             func(entry, data);