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 <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2015-01-25 12:28:06 +01:00 committed by Dirk Hohndel
parent 6b3e361e90
commit 58173d711c

View file

@ -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;