mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-07 19:43:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Core: consider invalid flag when adding dives

Browse source 
Adding dives uses the number of the last dive to create a new
dive number. Ignore invalid dives.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-12-13 06:56:07 +01:00 • committed by Dirk Hohndel
parent 8585f0698c
commit 0d78fe45c3
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
core/divelist.c
View file

@ -1268,6 +1268,16 @@ void process_imported_dives(struct dive_table *import_table, struct trip_table *
} }
} }
static struct dive *get_last_valid_dive()
{
int i;
for (i = dive_table.nr - 1; i >= 0; i--) {
if (!dive_table.dives[i]->invalid)
return dive_table.dives[i];
}
return NULL;
}
/* return the number a dive gets when inserted at the given index. /* return the number a dive gets when inserted at the given index.
* this function is supposed to be called *before* a dive was added. * this function is supposed to be called *before* a dive was added.
* this returns: * this returns:
@ -1277,13 +1287,10 @@ void process_imported_dives(struct dive_table *import_table, struct trip_table *
*/ */
int get_dive_nr_at_idx(int idx) int get_dive_nr_at_idx(int idx)
{ {
if (dive_table.nr == 0) struct dive *last_dive = get_last_valid_dive(dive_table.nr - 1);
if (!last_dive)
return 1; return 1;
if (idx >= dive_table.nr) { return last_dive->number ? last_dive->number + 1 : 0;
struct dive *last_dive = get_dive(dive_table.nr - 1);
return last_dive->number ? last_dive->number + 1 : 0;
}
return 0;
} }
void set_dive_nr_for_current_dive() void set_dive_nr_for_current_dive()