summaryrefslogtreecommitdiffstats
path: root/core/dive.h
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2018-07-28 21:26:59 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-10-11 16:22:27 -0700
commit6ac4ddbeeda5286faacac9633b622dcf298eea7b (patch)
tree93a3e8ad8388e18866477168688a6162a469e9e0 /core/dive.h
parent43c3885249fb867e7c33c8b3b5846d44e908774f (diff)
downloadsubsurface-6ac4ddbeeda5286faacac9633b622dcf298eea7b.tar.gz
Core: introduce insert_trip_dont_merge() function
insert_trip() adds a trip to the backend, but merges trips if there exists a trip with the same date. This is a disaster for the MergeTrips command, because this command adds a new trip and removes the previous two. Of course if the added trip is merged, this cannot work. Therefore, add an insert_trip_dont_merge() function, which adds the trip, but doesn't merge. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/dive.h')
-rw-r--r--core/dive.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/dive.h b/core/dive.h
index 6fd53fba9..3077c5bce 100644
--- a/core/dive.h
+++ b/core/dive.h
@@ -422,6 +422,7 @@ extern int dive_get_insertion_index(struct dive *dive);
extern void add_single_dive(int idx, struct dive *dive);
extern void insert_trip(dive_trip_t **trip);
+extern void insert_trip_dont_merge(dive_trip_t *trip);
extern void unregister_trip(dive_trip_t *trip);
extern void free_trip(dive_trip_t *trip);