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

Simplify bailout events in the dive log

Browse source 
I removed the special event type that has been used for bailout events.
Bailout events are now just bookmarks with a specific name "e.g. OC,
CCR, PSCR). This removes a case where a segmentation error occurred
when trying to remove a bailout event from the dive profile.

Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
This commit is contained in:
Willem Ferguson 2018-04-05 12:02:25 +02:00 • committed by Lubomir I. Ivanov
parent 27a0542220
commit c1d04ef7dc
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/dive.c
View file

@ -250,7 +250,6 @@ struct event *get_next_divemodechange(struct event **evd)
while (ev) { // Step through the events. while (ev) { // Step through the events.
for (int i=0; i<3; i++) { // For each event name search for one of the above strings for (int i=0; i<3; i++) { // For each event name search for one of the above strings
if (!strcmp(ev->name,divemode_text[i])) { // if the event name is one of the divemode names if (!strcmp(ev->name,divemode_text[i])) { // if the event name is one of the divemode names
ev->type = DIVEMODECHANGE_EVENTTYPE + i;
ev->divemode = i; // set the event type to the dive mode ev->divemode = i; // set the event type to the dive mode
*evd = ev->next; *evd = ev->next;
return (ev); return (ev);

6
core/dive.h
View file

@ -83,16 +83,14 @@ struct event {
/* This is the annoying libdivecomputer format. */ /* This is the annoying libdivecomputer format. */
int flags, value; int flags, value;
/* .. and this is our "extended" data for some event types */ /* .. and this is our "extended" data for some event types */
enum dive_comp_type divemode;
union { union {
enum dive_comp_type divemode; // for divemode change events
/* /*
* Currently only for gas switch events.
*
* NOTE! The index may be -1, which means "unknown". In that * NOTE! The index may be -1, which means "unknown". In that
* case, the get_cylinder_index() function will give the best * case, the get_cylinder_index() function will give the best
* match with the cylinders in the dive based on gasmix. * match with the cylinders in the dive based on gasmix.
*/ */
struct { struct { // for gas switch events
int index; int index;
struct gasmix mix; struct gasmix mix;
} gas; } gas;