X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.c;h=deb72fc804225712edf164d52ab1a4fca5ba1d93;hb=9463ca1f1c52ba1fd4b17946a209742685815c68;hp=9af6449e22215d0004c5399a8e5c609c62186f28;hpb=cbcfcddfb167ac242b27d253b9d8f36e78255865;p=ext%2Fsubsurface.git

diff --git a/dive.c b/dive.c
index 9af6449..deb72fc 100644
--- a/dive.c
+++ b/dive.c
@@ -410,7 +410,7 @@ struct dive *try_to_merge(struct dive *a, struct dive *b)
 	int i;
 	struct dive *res;
 
-	if (a->when != b->when)
+	if ((a->when >= b->when + 60) || (a->when <= b->when - 60))
 		return NULL;
 
 	res = alloc_dive();