mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow merging of dives with zero depth/duration

Browse source 
Fixes #1003

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2016-02-04 21:16:04 +02:00 • committed by Dirk Hohndel
parent 545b106d5c
commit 24e2f83d67
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
subsurface-core/dive.c
View file

@ -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) static int similar(unsigned long a, unsigned long b, unsigned long expected)
{ {
if (!a && !b)
return 1;
if (a && b) { if (a && b) {
unsigned long min, max, diff; unsigned long min, max, diff;