altosdroid: Deal with AltosState changes

[fw/altos] / altosui / AltosGraphUI.java

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index a3107f2bfc183362d773620ffe5bda82fc828148..71aa0e6f9c719669ae54a56e182f85d510dc25a2 100644 (file)
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -46,17 +46,19 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
                boolean                 any_gps = false;
                AltosGPSTimeValue       gtv_last = null;
 
-               for (AltosGPSTimeValue gtv : flight_series.gps_series) {
-                       gtv_last = gtv;
-                       AltosGPS gps = gtv.gps;
-                       if (gps != null &&
-                           gps.locked &&
-                           gps.nsat >= 4) {
-                               if (map == null)
-                                       map = new AltosUIMap();
-                               map.show(gps, (int) flight_series.value_before(AltosFlightSeries.state_name, gtv.time));
-                               this.gps = gps;
-                               has_gps = true;
+               if (flight_series.gps_series != null) {
+                       for (AltosGPSTimeValue gtv : flight_series.gps_series) {
+                               gtv_last = gtv;
+                               AltosGPS gps = gtv.gps;
+                               if (gps != null &&
+                                   gps.locked &&
+                                   gps.nsat >= 4) {
+                                       if (map == null)
+                                               map = new AltosUIMap();
+                                       map.show(gps, (int) flight_series.value_before(AltosFlightSeries.state_name, gtv.time));
+                                       this.gps = gps;
+                                       has_gps = true;
+                               }
                        }
                }
                if (gtv_last != null) {
@@ -93,7 +95,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 
                set.capture_series(flight_series);
 
-               flight_series.fill_in();
+               flight_series.finish();
 
                stats = new AltosFlightStats(flight_series);