Merge branch 'webservice-import'

Update maxdepth / duration that have moved into the divecomputer
structure.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 4 insertions, 1 deletions

diff --git a/main.c b/main.c
index 0e98d9059..b471e5f9d 100644
--- a/main.c
+++ b/main.c
@@ -165,7 +165,10 @@ void report_dives(gboolean is_imported, gboolean prefer_imported)
 		struct dive *dive = pp[1];
 		struct dive *merged;
 
-		if (prev->when + prev->dc.duration.seconds < dive->when)
+		/* only try to merge overlapping dives - or if one of the dives has
+		 * zero duration (that might be a gps marker from the webservice) */
+		if (prev->dc.duration.seconds && dive->dc.duration.seconds &&
+		    prev->when + prev->dc.duration.seconds < dive->when)
 			continue;
 
 		merged = try_to_merge(prev, dive, prefer_imported);