mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Core: don't copy dive-id on merge dive

Browse source 
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 <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-12-23 16:54:24 +01:00 • committed by Dirk Hohndel
parent 0dfc59f38c
commit fd196f143a
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/divelist.c
View file

@ -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;