From: Dana Jansens <danakj@orodu.net>
Date: Mon, 24 Jan 2011 21:45:56 +0000 (-0500)
Subject: Fix for when the menu's update function returns FALSE and no menu is shown.
X-Git-Tag: release-3.5.1~95
X-Git-Url: http://git.openbox.org/?p=dana%2Fopenbox.git;a=commitdiff_plain;h=f53fa1e589589a6ea2a0e91d372d9771fa1cdd04;ds=sidebyside

Fix for when the menu's update function returns FALSE and no menu is shown.

The ObMenuFrame was not being freed, and the child pointer was being left
pointing to the frame that was not visible.
---

diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 6110045..4887173 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -1046,8 +1046,11 @@ gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
         parent->child_entry = parent_entry;
     }
 
-    if (!menu_frame_show(self))
+    if (!menu_frame_show(self)) {
+        parent->child = NULL;
+        parent->child_entry = NULL;
         return FALSE;
+    }
 
     menu_frame_place_submenu(self, &x, &y);
     menu_frame_move_on_screen(self, x, y, &dx, &dy);
@@ -1272,7 +1275,8 @@ void menu_entry_frame_show_submenu(ObMenuEntryFrame *self)
     /* pass our direction on to our child */
     f->direction_right = self->frame->direction_right;
 
-    menu_frame_show_submenu(f, self->frame, self);
+    if (!menu_frame_show_submenu(f, self->frame, self))
+        menu_frame_free(f);
 }
 
 void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state)