From fd196f143ae9c6b3a51b057ba134c5e3a280e30f Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 23 Dec 2018 16:54:24 +0100 Subject: [PATCH] Core: don't copy dive-id on merge dive The installment of the divelist-undo system has made it unnecessary to adopt the uniq-id of the merged-into dive. On the contrary, we want to avoid two dives with the same dive-id in the divelist at all costs, since get_divenr() still uses the id and thus may fetch the wrong dive. Therefore, don't copy the dive-id on merge. Signed-off-by: Berthold Stoeger --- core/divelist.c | 1 - 1 file changed, 1 deletion(-) diff --git a/core/divelist.c b/core/divelist.c index f691cd7f1..79b116e06 100644 --- a/core/divelist.c +++ b/core/divelist.c @@ -1503,7 +1503,6 @@ static bool try_to_merge_into(struct dive *dive_to_add, int idx, struct dive_tab if (!replace_in && old_dive->divetrip) replace_in = &old_dive->divetrip->dives; - merged->id = old_dive->id; merged->selected = old_dive->selected; merged->divetrip = old_dive->divetrip; old_dive->divetrip = NULL;