From 08db197af2bc37cdfeb72fcbeb78924b5cebcc74 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 27 Oct 2015 11:05:00 -0400 Subject: [PATCH] icon theme: Ensure to propagate an error If the svg pixbuf loader is not available, we end up with criticals from gtk_css_image_icon_theme_draw because gtk_icon_info_load_symbolic returns NULL without setting an error. Avoid this by propagating the load error. --- gtk/gtkicontheme.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 001dc22b8d..59e99fc6f7 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -4441,7 +4441,11 @@ gtk_icon_info_load_symbolic_svg (GtkIconInfo *icon_info, return NULL; if (!icon_info_ensure_scale_and_pixbuf (icon_info)) - return NULL; + { + g_propagate_error (error, icon_info->load_error); + icon_info->load_error = NULL; + return NULL; + } if (icon_info->symbolic_width == 0 || icon_info->symbolic_height == 0)