summaryrefslogtreecommitdiffstats
path: root/core/dive.c
diff options
context:
space:
mode:
authorGravatar Robert C. Helling <helling@atdotde.de>2018-04-27 20:14:07 +0200
committerGravatar Lubomir I. Ivanov <neolit123@gmail.com>2018-05-14 23:47:00 +0300
commit09da42f8192a83dba0b7b31b78b5c40100e164b1 (patch)
treefb84f2ddbd75a98a6d68ca8870b5138e4b1bc0e8 /core/dive.c
parent5bac32a1b57862579d15e70ce1c5f1e8adab59b8 (diff)
downloadsubsurface-09da42f8192a83dba0b7b31b78b5c40100e164b1.tar.gz
Fix divemode detection in planner
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Diffstat (limited to 'core/dive.c')
-rw-r--r--core/dive.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/core/dive.c b/core/dive.c
index d75de418e..9ec95c141 100644
--- a/core/dive.c
+++ b/core/dive.c
@@ -250,11 +250,10 @@ enum dive_comp_type get_current_divemode(struct divecomputer *dc, int time, stru
struct event *ev = *evp;
if (*divemode == UNDEF_COMP_TYPE) {
*divemode = dc->divemode;
- ev = dc ? dc->events : NULL;
+ ev = dc ? get_next_event(dc->events, "modechange") : NULL;
}
while (ev && ev->time.seconds < time) {
- if (ev != dc->events)
- *divemode = (enum dive_comp_type) ev->value;
+ *divemode = (enum dive_comp_type) ev->value;
ev = get_next_event(ev->next, "modechange");
}
*evp = ev;