use multimaint-merge to make Debian changelogs less ugly

[fw/altos] / altosui / AltosDataPointReader.java

diff --git a/altosui/AltosDataPointReader.java b/altosui/AltosDataPointReader.java
index fa48013f3b1053a65678ee02f6535aa834cb5035..c3aabb0c674721299d5202bfa0b0d5bb131db1a9 100644 (file)
--- a/altosui/AltosDataPointReader.java
+++ b/altosui/AltosDataPointReader.java
@@ -69,10 +69,14 @@ class AltosDataPointReader implements Iterable<AltosDataPoint> {
                 throw new UnsupportedOperationException(); 
             }
             public boolean hasNext() {
+               if (record != null && record.state == Altos.ao_flight_landed)
+                   return false;
                 return iter.hasNext();
             }
             public AltosDataPoint next() {
-                read_next_record();
+               do {
+                   read_next_record();
+               } while (record.time < -1.0 && hasNext());
                 return current_dp();
             }
         };