summaryrefslogtreecommitdiffstats
path: root/dive.c
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-04-23 15:24:02 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-04-23 15:27:21 -0700
commit415abeea66d180da05bdb5ad31439d6f937d7168 (patch)
tree663de2cf3b3d0cc0c9de0866dbcec6d06bbc6cf7 /dive.c
parentbbfa2b655bac88306f8e7805f2eb61b2f801ad0a (diff)
downloadsubsurface-415abeea66d180da05bdb5ad31439d6f937d7168.tar.gz
When deleting a cylinder, adapt gas changes
When we delete a cylinder the gas changes in that dive may have to be adjusted. We didn't do this at all in the past. With this commit we should be doing this right for a single dive that is being edited. This does NOT handle multiple dives being edited at the same time (or more specifically - if you have multiple dives selected and delete a cylinder, the dives that had the same set of cylinders (other than the displayed dive) will get that particular cylinder deleted, but won't have their gas change events (and sensor data in the samples) adapted. Possibly we should simply prohibit deleting cylinders when more than one dive are selected. See #834 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'dive.c')
-rw-r--r--dive.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/dive.c b/dive.c
index bdb6937d4..2b98c2a77 100644
--- a/dive.c
+++ b/dive.c
@@ -1758,7 +1758,7 @@ static void add_initial_gaschange(struct dive *dive, struct divecomputer *dc)
add_gas_switch_event(dive, dc, 0, 0);
}
-static void dc_cylinder_renumber(struct dive *dive, struct divecomputer *dc, int mapping[])
+void dc_cylinder_renumber(struct dive *dive, struct divecomputer *dc, int mapping[])
{
int i;
struct event *ev;
@@ -2259,7 +2259,7 @@ struct dive *try_to_merge(struct dive *a, struct dive *b, bool prefer_downloaded
return NULL;
}
-static void free_events(struct event *ev)
+void free_events(struct event *ev)
{
while (ev) {
struct event *next = ev->next;