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 <dirk@hohndel.org>

1 files changed, 5 insertions, 0 deletions

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) {
 		/*