From ea1cc4b99109029d9fdf7c98b73a9c3997c44901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Fri, 5 Jun 2020 06:26:56 +0200 Subject: [PATCH] filechooserwidget: Avoid an uninitialised value For NULL filters, we were never calling g_list_store_find, so leaving filter_index undefined. --- gtk/gtkfilechooserwidget.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index a6b9729ef2..1f153896d0 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -6900,8 +6900,15 @@ set_current_filter (GtkFileChooserWidget *impl, guint filter_index; /* NULL filters are allowed to reset to non-filtered status */ - if (filter && !g_list_store_find (impl->filters, filter, &filter_index)) - return; + if (filter) + { + if (!g_list_store_find (impl->filters, filter, &filter_index)) + return; + } + else + { + filter_index = -1; + } if (impl->current_filter) g_object_unref (impl->current_filter); @@ -6911,7 +6918,6 @@ set_current_filter (GtkFileChooserWidget *impl, gtk_drop_down_set_selected (GTK_DROP_DOWN (impl->filter_combo), filter_index); -g_print ("set current filter %u\n", filter_index); clear_model_cache (impl, MODEL_COL_IS_SENSITIVE); set_model_filter (impl, impl->current_filter); g_object_notify (G_OBJECT (impl), "filter");