From 4c5ec184706939f3d1b680ab34a2ce0dfa95743f Mon Sep 17 00:00:00 2001 From: John Lindgren Date: Fri, 10 Jul 2015 12:55:36 -0400 Subject: [PATCH] Fix assertion 'GTK_IS_WIDGET (widget)' failed. --- garcon-gtk/garcon-gtk-menu.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c index 58f0961..79d99c1 100644 --- a/garcon-gtk/garcon-gtk-menu.c +++ b/garcon-gtk/garcon-gtk-menu.c @@ -504,11 +504,7 @@ garcon_gtk_menu_load_icon (const gchar *icon_name) gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h); size = MIN (w, h); - if (gtk_icon_theme_has_icon (icon_theme, icon_name)) - { - image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); - } - else + if (! gtk_icon_theme_has_icon (icon_theme, icon_name)) { if (g_path_is_absolute (icon_name)) { @@ -556,6 +552,9 @@ garcon_gtk_menu_load_icon (const gchar *icon_name) } } + if (image == NULL) + image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); + return image; } -- 2.4.5