From ebc3b148dbb57d8da77cfa93e22d77fffc2b9ea1 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 30 Sep 2015 07:45:55 -0400 Subject: Don't merge manually added dives If the user added a dive manually we have a hard time trusting the start time and duration. We just shouldn't automatically merge them with anything else. Signed-off-by: Dirk Hohndel --- dive.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dive.c b/dive.c index 9c70a121c..49b2312d2 100644 --- a/dive.c +++ b/dive.c @@ -2230,6 +2230,11 @@ static int likely_same_dive(struct dive *a, struct dive *b) { int match, fuzz = 20 * 60; + /* don't merge manually added dives with anything */ + if (same_string(a->dc.model, "manually added dive") || + same_string(b->dc.model, "manually added dive")) + return 0; + /* Don't try to merge dives with different trip information */ if (a->divetrip != b->divetrip) { /* -- cgit v1.2.3-70-g09d2