diff options
author | Bdale Garbee <bdale@gag.com> | 2012-08-28 23:39:53 -0600 |
---|---|---|
committer | Bdale Garbee <bdale@gag.com> | 2012-08-28 23:39:53 -0600 |
commit | 5ed88fb72c3e3ecf3333c700d838667db71cfbdc (patch) | |
tree | 3b371f563c0f7607f2fe53242673adb352b48514 /altoslib/AltosRecord.java | |
parent | adbe64c5a9402b7c5075a444a12629131b663877 (diff) | |
parent | 621d0930244f25165d2ac5da596dcc87e253b965 (diff) |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Conflicts:
debian/control
Diffstat (limited to 'altoslib/AltosRecord.java')
-rw-r--r-- | altoslib/AltosRecord.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/altoslib/AltosRecord.java b/altoslib/AltosRecord.java index e468f84b..8722bc05 100644 --- a/altoslib/AltosRecord.java +++ b/altoslib/AltosRecord.java @@ -127,7 +127,7 @@ public class AltosRecord implements Comparable <AltosRecord>, Cloneable { double p = filtered_pressure(); if (p == MISSING) - return MISSING; + return raw_altitude(); return AltosConvert.pressure_to_altitude(p); } |