Merge branch 'issue-2111' into 'gtk-3-24'

Do not crash when icon themes do not have a context

See merge request GNOME/gtk!1179
This commit is contained in:
Emmanuele Bassi
2019-11-13 15:23:30 +00:00

View File

@@ -3204,8 +3204,12 @@ theme_list_contexts (IconTheme *theme,
{
dir = l->data;
context = g_quark_to_string (dir->context);
g_hash_table_replace (contexts, (gpointer) context, NULL);
/* The "Context" key can be unset */
if (dir->context != 0)
{
context = g_quark_to_string (dir->context);
g_hash_table_replace (contexts, (gpointer) context, NULL);
}
l = l->next;
}