From: Miika Turkia Date: Fri, 9 Dec 2011 17:27:01 +0000 (+0200) Subject: Show O2 per cent if given in cylinder info X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=fe532a585cb0c1250cca5994a78394aadc3e14dd;p=ext%2Fsubsurface.git Show O2 per cent if given in cylinder info O2 per cent from dive computer should be shown in Dive Info if one is given even without pressure information for the cylinder. Signed-off-by: Miika Turkia Signed-off-by: Linus Torvalds --- diff --git a/statistics.c b/statistics.c index 4c63794..5cb242e 100644 --- a/statistics.c +++ b/statistics.c @@ -172,7 +172,7 @@ void show_dive_stats(struct dive *dive) /* we assume that every valid cylinder has either a working pressure * or a size; but for good measure let's also accept cylinders with * a starting or ending pressure*/ - if (cyl->type.workingpressure.mbar || cyl->type.size.mliter || start || end) { + if (cyl->type.workingpressure.mbar || cyl->type.size.mliter || cyl->gasmix.o2.permille || start || end) { /* 0% O2 strangely means air, so 21% - I don't like that at all */ int o2 = cyl->gasmix.o2.permille ? : 209; if (offset > 0) {