summaryrefslogtreecommitdiffstats
path: root/core/dive.c
diff options
context:
space:
mode:
Diffstat (limited to 'core/dive.c')
-rw-r--r--core/dive.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/dive.c b/core/dive.c
index 22f88d43f..47143aaa3 100644
--- a/core/dive.c
+++ b/core/dive.c
@@ -2564,10 +2564,9 @@ static void merge_temperatures(struct dive *res, const struct dive *a, const str
*/
static void pick_trip(struct dive *res, const struct dive *pick)
{
- tripflag_t tripflag = pick->tripflag;
dive_trip_t *trip = pick->divetrip;
- res->tripflag = tripflag;
+ res->notrip = pick->notrip;
add_dive_to_trip(res, trip);
}