AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 22:20:24 +00:00
Code Issues Projects Releases Wiki Activity

filechooser: Don't assert for possible cases

Browse Source 
switch_to_selected_folder can be called when the
selection contains more than one item. Handle it
like it used to be handled: switch to the first
folder we find.

Fixes: #5494
This commit is contained in:
Matthias Clasen 2023-01-05 08:37:29 -05:00
parent 7c5c843b5b
commit fc1f1366b4
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gtk/gtkfilechooserwidget.c
View File

@ -4914,17 +4914,31 @@ gtk_file_chooser_widget_get_shortcut_folders (GtkFileChooser *chooser)
static void static void
switch_to_selected_folder (GtkFileChooserWidget *impl) switch_to_selected_folder (GtkFileChooserWidget *impl)
{ {
GFileInfo *info; GtkBitsetIter iter;
GFile *file; GtkBitset *bitset;
unsigned int i;
g_assert (!impl->select_multiple); bitset = gtk_selection_model_get_selection (impl->selection_model);
g_assert (GTK_IS_SINGLE_SELECTION (impl->selection_model));
info = gtk_single_selection_get_selected_item (GTK_SINGLE_SELECTION (impl->selection_model)); for (gtk_bitset_iter_init_first (&iter, bitset, &i);
g_assert (info != NULL); gtk_bitset_iter_is_valid (&iter);
gtk_bitset_iter_next (&iter, &i))
{
GFileInfo *info;
file = _gtk_file_info_get_file (info); info = g_list_model_get_item (G_LIST_MODEL (impl->selection_model), i);
change_folder_and_display_error (impl, file, FALSE); if (_gtk_file_info_consider_as_directory (info))
{
GFile *file;
file = _gtk_file_info_get_file (info);
change_folder_and_display_error (impl, file, FALSE);
g_object_unref (info);
return;
}
g_clear_object (&info);
}
} }
/* Gets the display name of the selected file in the file list; assumes single /* Gets the display name of the selected file in the file list; assumes single