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>
2016-02-04 21:16:04 +02:00 · 2016-02-04 21:16:04 +02:00 · 875a9035fb
commit 875a9035fb
parent 7e1ba8e925
1 changed files with 3 additions and 0 deletions
--- 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;