X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=statistics.c;fp=statistics.c;h=4c637944329f8e3bea52257909c6f7f666acca16;hb=66c04f4f47f1f8fc55b3cc81df67acac1aa72b8f;hp=ee3a5b22031e9221de9b346b89f187558931f00b;hpb=c32cff2c6be74a6284f940328622740953008020;p=ext%2Fsubsurface.git

diff --git a/statistics.c b/statistics.c
index ee3a5b2..4c63794 100644
--- a/statistics.c
+++ b/statistics.c
@@ -165,11 +165,14 @@ void show_dive_stats(struct dive *dive)
 	/* for the O2/He readings just create a list of them */
 	for (idx = 0; idx < MAX_CYLINDERS; idx++) {
 		cylinder_t *cyl = &dive->cylinder[idx];
+		unsigned int start, end;
+
+		start = cyl->start.mbar ? : cyl->sample_start.mbar;
+		end = cyl->end.mbar ? : cyl->sample_end.mbar;
 		/* 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 ||
-			cyl->start.mbar || cyl->end.mbar) {
+		if (cyl->type.workingpressure.mbar || cyl->type.size.mliter || 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) {
@@ -182,9 +185,8 @@ void show_dive_stats(struct dive *dive)
 		}
 		/* and if we have size, start and end pressure, we can
 		 * calculate the total gas used */
-		if (cyl->type.size.mliter && cyl->start.mbar &&	cyl->end.mbar)
-			gas_used += cyl->type.size.mliter / 1000.0 *
-				(cyl->start.mbar - cyl->end.mbar);
+		if (cyl->type.size.mliter && start && end)
+			gas_used += cyl->type.size.mliter / 1000.0 * (start - end);
 	}
 	set_label(info_stat_w.o2he, buf);
 	if (gas_used) {