From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 9 Nov 2011 15:56:07 +0000 (-0800)
Subject: If we don't have cylinder working pressure, we sill want to show the volume
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=2b26b6433f77cb4bf7523a90148a0087549e30e5;p=ext%2Fsubsurface.git

If we don't have cylinder working pressure, we sill want to show the volume

.. although in that case we can only ever show the volume in liters, and
cannot do a conversion to cubic feet even if the user has set imperial
units.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/equipment.c b/equipment.c
index c7a683b..62183c0 100644
--- a/equipment.c
+++ b/equipment.c
@@ -71,12 +71,12 @@ static int convert_volume_pressure(int ml, int mbar, double *v, double *p)
 	int decimals = 1;
 	double volume, pressure;
 
+	volume = ml / 1000.0;
 	if (mbar) {
 		if (output_units.volume == CUFT) {
 			volume = ml_to_cuft(ml);
 			volume *= bar_to_atm(mbar / 1000.0);
-		} else
-			volume = ml / 1000.0;
+		}
 
 		if (output_units.pressure == PSI) {
 			pressure = mbar_to_PSI(mbar);