mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-20 06:45:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use the infrastructure for moving dives in more places

Browse source 
Instead of using our generic helper function the code in
remove_from_trip_cb tried to implement the special case - and got it
wrong. This fixes yet another crash that Henrik found.

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-03 20:36:46 -07:00
parent 2a1d7a510c
commit 70d254ab84
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
divelist.c
View file

@ -1398,7 +1398,7 @@ static void insert_trip_before_cb(GtkWidget *menuitem, GtkTreePath *path)
static void remove_from_trip_cb(GtkWidget *menuitem, GtkTreePath *path) static void remove_from_trip_cb(GtkWidget *menuitem, GtkTreePath *path)
{ {
GtkTreeIter iter, newiter, parent; GtkTreeIter iter, nextiter, *newiter, parent;
GtkTreePath *nextpath; GtkTreePath *nextpath;
struct dive *dive; struct dive *dive;
int idx; int idx;
@ -1411,26 +1411,28 @@ static void remove_from_trip_cb(GtkWidget *menuitem, GtkTreePath *path)
in two right after this dive */ in two right after this dive */
nextpath = gtk_tree_path_copy(path); nextpath = gtk_tree_path_copy(path);
gtk_tree_path_next(nextpath); gtk_tree_path_next(nextpath);
if (gtk_tree_model_get_iter(MODEL(dive_list), &newiter, nextpath)) if (gtk_tree_model_get_iter(MODEL(dive_list), &nextiter, nextpath))
insert_trip_before(nextpath); insert_trip_before(nextpath);
/* now create a new node as sibling right after the current parent */ /* now move the dive to the top level, as sibling after its former parent */
gtk_tree_store_insert_after(STORE(dive_list), &newiter, NULL, &parent); newiter = move_dive_between_trips(&iter, &parent, NULL, &parent, FALSE);
copy_tree_node(&iter, &newiter); gtk_tree_model_get(MODEL(dive_list), newiter, DIVE_INDEX, &idx, -1);
gtk_tree_model_get(MODEL(dive_list), &iter, DIVE_INDEX, &idx, -1);
dive = get_dive(idx); dive = get_dive(idx);
if (dive->selected) { if (dive->selected) {
GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view)); GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view));
gtk_tree_selection_select_iter(selection, &newiter); gtk_tree_selection_select_iter(selection, newiter);
} }
gtk_tree_store_remove(STORE(dive_list), &iter);
/* if this was the last dive on the trip, remove the trip */ /* if this was the last dive on the trip, remove the trip */
if (! gtk_tree_model_iter_has_child(MODEL(dive_list), &parent)) { if (! gtk_tree_model_iter_has_child(MODEL(dive_list), &parent)) {
gtk_tree_store_remove(STORE(dive_list), &parent); gtk_tree_store_remove(STORE(dive_list), &parent);
delete_trip(FIND_TRIP(dive->divetrip->when)); delete_trip(FIND_TRIP(dive->divetrip->when));
free(dive->divetrip);
} }
/* mark the dive as intentionally at the top level */
dive->tripflag = NO_TRIP; dive->tripflag = NO_TRIP;
dive->divetrip = NULL; dive->divetrip = NULL;
#ifdef DEBUG_TRIP
dump_trip_list();
#endif
} }
void remove_trip(GtkTreePath *trippath, gboolean force_no_trip) void remove_trip(GtkTreePath *trippath, gboolean force_no_trip)
@ -1471,6 +1473,9 @@ void remove_trip(GtkTreePath *trippath, gboolean force_no_trip)
gtk_tree_store_remove(STORE(dive_list), &parent); gtk_tree_store_remove(STORE(dive_list), &parent);
delete_trip(FIND_TRIP(dive_trip->when)); delete_trip(FIND_TRIP(dive_trip->when));
free(dive_trip); free(dive_trip);
#ifdef DEBUG_TRIP
dump_trip_list();
#endif
} }
void remove_trip_cb(GtkWidget *menuitem, GtkTreePath *trippath) void remove_trip_cb(GtkWidget *menuitem, GtkTreePath *trippath)