diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-11-18 11:06:24 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-11-20 08:14:54 -0800 |
| commit | 3b9e0b59311908f6cbc099f3b7fd5294fd5d0d30 (patch) | |
| tree | 8c48b277b2e24855903144770338b5af60c785db /core/divelist.c | |
| parent | dcb2a17b7dcef6bd0802897f9ef2cfbe4206fe61 (diff) | |
| download | subsurface-3b9e0b59311908f6cbc099f3b7fd5294fd5d0d30.tar.gz | |
Core: remove ASSIGNED_TRIP trip flag
The distinction between ASSIGNED_TRIP and IN_TRIP was used to
prefer non-autogenerated trips on merging of dives. But owing
to bit rot this seem to have worked only partially anyway:
The IN_TRIP field was set in create_and_hookup_trip_from_dive()
and immediately overwritten in add_dive_to_trip() called
in the next line.
Instead, use the trip->autogen flag to check for priority and
remove the ASSIGNED_TRIP flag alltogether.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/divelist.c')
| -rw-r--r-- | core/divelist.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/divelist.c b/core/divelist.c index 7f946b039..f887cc82c 100644 --- a/core/divelist.c +++ b/core/divelist.c @@ -896,7 +896,7 @@ void add_dive_to_trip(struct dive *dive, dive_trip_t *trip) remove_dive_from_trip(dive, false); add_dive_to_table(&trip->dives, -1, dive); dive->divetrip = trip; - dive->tripflag = ASSIGNED_TRIP; + dive->tripflag = IN_TRIP; } dive_trip_t *alloc_trip(void) @@ -921,7 +921,6 @@ dive_trip_t *create_and_hookup_trip_from_dive(struct dive *dive) dive_trip = create_trip_from_dive(dive); insert_trip(dive_trip); - dive->tripflag = IN_TRIP; add_dive_to_trip(dive, dive_trip); return dive_trip; } |