From 58173d711c29b1f913e4264c2ed689e5553e035b Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Sun, 25 Jan 2015 12:28:06 +0100 Subject: [PATCH] Have get_dive_gas return air when without cylinders If we called get_dive_gas on a dive without cylinders, we returned 100%, which is quite wrong. This makes us return air as default gas instead. Signed-off-by: Anton Lundin Signed-off-by: Dirk Hohndel --- divelist.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/divelist.c b/divelist.c index ba11f02c1..f1dd7006c 100644 --- a/divelist.c +++ b/divelist.c @@ -134,7 +134,8 @@ void get_dive_gas(struct dive *dive, int *o2_p, int *he_p, int *o2max_p) mino2 = o2; } /* All air? Show/sort as "air"/zero */ - if (!maxhe && maxo2 == O2_IN_AIR && mino2 == maxo2) + if ((!maxhe && maxo2 == O2_IN_AIR && mino2 == maxo2) || + (maxo2 == -1 && maxhe == -1 && mino2 == 1000)) maxo2 = mino2 = 0; *o2_p = mino2; *he_p = maxhe;