diff options
| -rw-r--r-- | core/dive.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/dive.c b/core/dive.c index 23262540c..0cf050ba9 100644 --- a/core/dive.c +++ b/core/dive.c @@ -246,9 +246,11 @@ void add_extra_data(struct divecomputer *dc, const char *key, const char *value) enum divemode_t get_current_divemode(const struct divecomputer *dc, int time, const struct event **evp, enum divemode_t *divemode) { const struct event *ev = *evp; - if (*divemode == UNDEF_COMP_TYPE && dc) { - *divemode = dc->divemode; - ev = get_next_event(dc->events, "modechange"); + if (dc) { + if (*divemode == UNDEF_COMP_TYPE) { + *divemode = dc->divemode; + ev = get_next_event(dc->events, "modechange"); + } } else { ev = NULL; } |