nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
The ObMenuFrame was not being freed, and the child pointer was being left
pointing to the frame that was not visible.
This commit is contained in:
Dana Jansens 2011-01-24 16:45:56 -05:00
parent fbc3e344cd
commit f53fa1e589
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
openbox/menuframe.c
View file

@ -1046,8 +1046,11 @@ gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
parent->child_entry = parent_entry; parent->child_entry = parent_entry;
} }
if (!menu_frame_show(self)) if (!menu_frame_show(self)) {
parent->child = NULL;
parent->child_entry = NULL;
return FALSE; return FALSE;
}
menu_frame_place_submenu(self, &x, &y); menu_frame_place_submenu(self, &x, &y);
menu_frame_move_on_screen(self, x, y, &dx, &dy); 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 */ /* pass our direction on to our child */
f->direction_right = self->frame->direction_right; 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) void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state)