diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-09 07:56:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-09 07:59:28 -0800 |
| commit | 2b26b6433f77cb4bf7523a90148a0087549e30e5 (patch) | |
| tree | 4d3ba91e2514da98505de6875d29c1ebace5ee18 /equipment.c | |
| parent | 97f09f3ea81548a3aac5ae839b1d1bc6211fe8ec (diff) | |
| download | subsurface-2b26b6433f77cb4bf7523a90148a0087549e30e5.tar.gz | |
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>
Diffstat (limited to 'equipment.c')
| -rw-r--r-- | equipment.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/equipment.c b/equipment.c index c7a683b89..62183c0c1 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); |