From 719b732230ea7a7afc28944ae359f762d6a6ef48 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 12 Dec 2013 15:03:25 -0800 Subject: Fix incorrect handling of autogrouped trips When toggling autogroup in the menu we ended up setting the NO_TRIP flag for dives that were removed from a trip that was created by autogroup. So toggling things on and off and on again meant no more auto grouping. Fixes #337 Signed-off-by: Dirk Hohndel --- divelist.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'divelist.h') diff --git a/divelist.h b/divelist.h index 109c61aef..9cac6f082 100644 --- a/divelist.h +++ b/divelist.h @@ -23,7 +23,7 @@ extern int trip_has_selected_dives(dive_trip_t *trip); extern void get_dive_gas(struct dive *dive, int *o2_p, int *he_p, int *o2low_p); extern int get_divenr(struct dive *dive); extern dive_trip_t *find_matching_trip(timestamp_t when); -extern void remove_dive_from_trip(struct dive *dive); +extern void remove_dive_from_trip(struct dive *dive, short was_autogen); extern dive_trip_t *create_and_hookup_trip_from_dive(struct dive *dive); extern void autogroup_dives(void); extern struct dive *merge_two_dives(struct dive *a, struct dive *b); -- cgit v1.2.3-70-g09d2