mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

When deleting dives make sure that amount_selected stays consistent

Browse source 
This could cause a crash if deleting the last dive and manually adding a
new one.

Reported-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2012-09-18 19:37:03 -04:00
parent f83625efa5
commit f73e5b7268
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
divelist.c
View file

@ -1754,13 +1754,16 @@ static void delete_dive_cb(GtkWidget *menuitem, GtkTreePath *path)
dive_table.nr--; dive_table.nr--;
free(dive); free(dive);
dive_list_update_dives(); dive_list_update_dives();
/* now make sure the same dives stay selected and if necessary their trips are expanded */ /* now make sure the same dives stay selected and if necessary their trips are expanded
* also make sure that amount_selected stays consistent */
amount_selected = 0;
for_each_dive(i, dive) { for_each_dive(i, dive) {
if (dive->selected) { if (dive->selected) {
GtkTreePath *path = get_path_from(dive); GtkTreePath *path = get_path_from(dive);
if (MODEL(dive_list) == TREEMODEL(dive_list)) if (MODEL(dive_list) == TREEMODEL(dive_list))
gtk_tree_view_expand_to_path(tree_view, path); gtk_tree_view_expand_to_path(tree_view, path);
gtk_tree_selection_select_path(selection, path); gtk_tree_selection_select_path(selection, path);
amount_selected++;
} }
} }
mark_divelist_changed(TRUE); mark_divelist_changed(TRUE);