summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-10-03 07:11:11 -0400
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-10-03 07:17:29 -0400
commitc30dfba433eb6e46d88a0c25cea7c4f47cb55f33 (patch)
tree548203d9b0149f182176862610497b4af514f64b
parente964f533ff8fdc8411dccf414ee8b91c0aa3dfe8 (diff)
downloadsubsurface-c30dfba433eb6e46d88a0c25cea7c4f47cb55f33.tar.gz
Don't delete the trip when splitting the only dive in a trip
When splitting dives make sure the new dives first are part of the same trip the original dive was in. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--dive.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/dive.c b/dive.c
index fb9c4cec7..321c9d166 100644
--- a/dive.c
+++ b/dive.c
@@ -2905,6 +2905,11 @@ static int split_dive_at(struct dive *dive, int a, int b)
fixup_dive(d1);
fixup_dive(d2);
+ if (dive->divetrip) {
+ d1->divetrip = d2->divetrip = 0;
+ add_dive_to_trip(d1, dive->divetrip);
+ add_dive_to_trip(d2, dive->divetrip);
+ }
if ((i = get_divenr(dive)) < 0)
return 0;