From 875a9035fb6678673dfe4d55467275176159673c Mon Sep 17 00:00:00 2001 From: Miika Turkia <miika.turkia@gmail.com> Date: Thu, 4 Feb 2016 21:16:04 +0200 Subject: Allow merging of dives with zero depth/duration Fixes #1003 Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org> --- dive.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dive.c b/dive.c index 976c30328..bb35f4454 100644 --- a/dive.c +++ b/dive.c @@ -2162,6 +2162,9 @@ static int find_sample_offset(struct divecomputer *a, struct divecomputer *b) */ static int similar(unsigned long a, unsigned long b, unsigned long expected) { + if (!a && !b) + return 1; + if (a && b) { unsigned long min, max, diff; -- cgit v1.2.3-70-g09d2