summaryrefslogtreecommitdiffstats
path: root/dive.c
diff options
context:
space:
mode:
Diffstat (limited to 'dive.c')
-rw-r--r--dive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dive.c b/dive.c
index 9af6449e2..deb72fc80 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();