Ensure that we do not attempt to free the tab popup when there is none.

This commit is contained in:
Tomas Frydrych
2009-02-03 13:16:01 +00:00
parent b0cc2a8614
commit 9dee164790
2 changed files with 11 additions and 2 deletions

View File

@ -3568,8 +3568,11 @@ meta_display_end_grab_op (MetaDisplay *display,
if (GRAB_OP_IS_WINDOW_SWITCH (display->grab_op) ||
display->grab_op == META_GRAB_OP_KEYBOARD_WORKSPACE_SWITCHING)
{
meta_ui_tab_popup_free (display->grab_screen->tab_popup);
display->grab_screen->tab_popup = NULL;
if (display->grab_screen->tab_popup)
{
meta_ui_tab_popup_free (display->grab_screen->tab_popup);
display->grab_screen->tab_popup = NULL;
}
/* If the ungrab here causes an EnterNotify, ignore it for
* sloppy focus