diff options
| -rw-r--r-- | gtk/gtkmenu.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index c4b8da2d79..741dbc2ced 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -847,14 +847,18 @@ gtk_menu_need_resize (GtkContainer *container) static void gtk_menu_deactivate (GtkMenuShell *menu_shell) { + GtkWidget *parent; + g_return_if_fail (menu_shell != NULL); g_return_if_fail (GTK_IS_MENU (menu_shell)); + parent = menu_shell->parent_menu_shell; + menu_shell->activate_time = 0; gtk_menu_popdown (GTK_MENU (menu_shell)); - if (menu_shell->parent_menu_shell) - gtk_menu_shell_deactivate (GTK_MENU_SHELL (menu_shell->parent_menu_shell)); + if (parent) + gtk_menu_shell_deactivate (GTK_MENU_SHELL (parent)); } |