summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--parse-xml.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/parse-xml.c b/parse-xml.c
index f582a302a..a7a44c5d0 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -889,12 +889,10 @@ static void try_to_fill_dc(struct divecomputer *dc, const char *name, char *buf)
void add_gas_switch_event(struct dive *dive, struct divecomputer *dc, int seconds, int idx)
{
/* The gas switch event format is insane. It will be fixed, I think */
- int o2 = dive->cylinder[idx].gasmix.o2.permille;
- int he = dive->cylinder[idx].gasmix.he.permille;
+ int o2 = get_o2(&dive->cylinder[idx].gasmix);
+ int he = get_he(&dive->cylinder[idx].gasmix);
int value;
- if (!o2)
- o2 = O2_IN_AIR;
o2 = (o2+5) / 10;
he = (he+5) / 10;
value = o2 + (he << 16);