diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-11-08 17:13:17 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2018-11-18 16:50:09 -0800 |
commit | 0618aa737fde54e634d16273ec0246ced9c454aa (patch) | |
tree | 0ebcb45cb2c3849d5b78fc979e9984380485a9a3 /icons/ostc2n.png | |
parent | c48056300d61987850dbe9ad92b20a293d03dc75 (diff) | |
download | subsurface-0618aa737fde54e634d16273ec0246ced9c454aa.tar.gz |
Core: unify insert_trip() and insert_trip_dont_merge()
There were two versions of the insert_trip() function: one
would merge trips if a trip with the same date already existed,
the other wouldn't. The latter was introduced with the dive-list
undo work.
The problem is that the "date" of a trip (i.e. the first dive)
seems ill-defined as this is a volatile value. Moreover in
the context of making dive-import undoable this is a very
dangerous notion, as the caller needs control over when the dives
are added to a trip.
Therefore, unify these two functions and never merge trips.
The decision on merging dives now has to made by the caller.
This will be implemented in a future commit.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'icons/ostc2n.png')
0 files changed, 0 insertions, 0 deletions