AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkFileChooser: Don't crash if invisible files are deleted

Browse Source 
This is a crash that has been around for a long time, as
can be seen here:
https://bugzilla.redhat.com/show_bug.cgi?id=1048388
https://bugzilla.redhat.com/show_bug.cgi?id=984375
https://bugzilla.redhat.com/show_bug.cgi?id=1159015
https://bugzilla.redhat.com/show_bug.cgi?id=1059187
https://bugzilla.redhat.com/show_bug.cgi?id=1122172
https://bugzilla.redhat.com/show_bug.cgi?id=1016895
https://bugzilla.redhat.com/show_bug.cgi?id=1133235
https://bugzilla.redhat.com/show_bug.cgi?id=1077500
https://bugzilla.redhat.com/show_bug.cgi?id=1054378
https://bugzilla.redhat.com/show_bug.cgi?id=1173212

Fix suggested by Benjamin Otte.
This commit is contained in:
Matthias Clasen 2014-12-11 22:52:59 -05:00
parent 661da5558c
commit f9c5799c82
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkfilesystemmodel.c
View File

@ -1886,6 +1886,7 @@ remove_file (GtkFileSystemModel *model,
GFile *file) GFile *file)
{ {
FileModelNode *node; FileModelNode *node;
gboolean was_visible;
guint id; guint id;
guint row; guint row;
@ -1897,6 +1898,7 @@ remove_file (GtkFileSystemModel *model,
return; return;
node = get_node (model, id); node = get_node (model, id);
was_visible = node->visible;
row = node_get_tree_row (model, id); row = node_get_tree_row (model, id);
node_invalidate_index (model, id); node_invalidate_index (model, id);
@ -1912,7 +1914,8 @@ remove_file (GtkFileSystemModel *model,
/* We don't need to resort, as removing a row doesn't change the sorting order of the other rows */ /* We don't need to resort, as removing a row doesn't change the sorting order of the other rows */
emit_row_deleted_for_row (model, row); if (was_visible)
emit_row_deleted_for_row (model, row);
} }
/** /**