diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-01-01 11:45:26 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2019-01-07 09:33:24 -0800 |
commit | 4d06ddd72351f7804acdaec81f0400a735581229 (patch) | |
tree | da5faaf51b301ab3d74acad472ad34cd6a801c40 /core/divesite.h | |
parent | da52440963ac8920acab82502114b74c98e170a1 (diff) | |
download | subsurface-4d06ddd72351f7804acdaec81f0400a735581229.tar.gz |
Dive sites: don't delete unused dive sites on save
Unused dive sites were deleted on save. This clashed with the undo
system in the following scenario:
1) Delete single-use dive site.
2) Save (dive site deleted)
3) Undo (reference to freed dive site)
Therefore, as a quick-fix, keep the referenced dive site around.
Note that this also means that empty dive sites must not be
deleted, as it might refer to a dive in the undo system. Instead
only clear references to empty dive sites in the global dive
table. Factor this functionality out, as it was common to the
XML and git savers.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/divesite.h')
-rw-r--r-- | core/divesite.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/divesite.h b/core/divesite.h index 3ce87128a..1cb0cbeff 100644 --- a/core/divesite.h +++ b/core/divesite.h @@ -73,6 +73,7 @@ void clear_dive_site(struct dive_site *ds); unsigned int get_distance(const location_t *loc1, const location_t *loc2); struct dive_site *find_or_create_dive_site_with_name(const char *name, timestamp_t divetime); void merge_dive_sites(struct dive_site *ref, struct dive_site *dive_sites[], int count); +void purge_empty_dive_sites(); #ifdef __cplusplus } |