FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly handle merging dives that are part of a trip

Browse Source 
If we have already created a dive_trip structure we need to also copy the link.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2012-09-29 16:18:19 -07:00
parent cfb1baa030
commit a544d74044
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dive.c
View File

@ -711,10 +711,13 @@ struct dive *try_to_merge(struct dive *a, struct dive *b)
res->when = a->when;
/* the larger tripflag is more relevant */
if(a->tripflag > b->tripflag)
if(a->tripflag > b->tripflag) {
res->tripflag = a->tripflag;
else
res->divetrip = a->divetrip;
} else {
res->tripflag = b->tripflag;
res->divetrip = b->divetrip;
}
MERGE_NONZERO(res, a, b, latitude);
MERGE_NONZERO(res, a, b, longitude);
MERGE_TXT(res, a, b, location);