dont ungrab twice when hiding menus

This commit is contained in:
Dana Jansens 2003-08-29 17:17:07 +00:00
parent 53134db127
commit 8a1e9c64d8

View file

@ -407,6 +407,7 @@ static void menu_frame_update(ObMenuFrame *self)
{
GList *mit, *fit;
menu_pipe_execute(self->menu);
menu_find_submenus(self->menu);
self->selected = NULL;
@ -480,8 +481,6 @@ void menu_frame_hide(ObMenuFrame *self)
if (!it)
return;
menu_frame_visible = g_list_delete_link(menu_frame_visible, it);
if (self->child)
menu_frame_hide(self->child);
@ -495,6 +494,8 @@ void menu_frame_hide(ObMenuFrame *self)
grab_keyboard(FALSE);
}
menu_frame_visible = g_list_delete_link(menu_frame_visible, it);
XUnmapWindow(ob_display, self->window);
menu_frame_free(self);