X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryFile.java;h=9c5f8dae92bc529266e1ca002a4e0d970397a5a9;hb=c296acd643698d0128e2f58f91a9cfeea63f580a;hp=9e992576272cd93df0b7ecc4db8b490fcf647a0e;hpb=f07f6d55edf5b97020680b3ce1d9e00bb3df64a6;p=fw%2Faltos

diff --git a/altoslib/AltosTelemetryFile.java b/altoslib/AltosTelemetryFile.java
index 9e992576..9c5f8dae 100644
--- a/altoslib/AltosTelemetryFile.java
+++ b/altoslib/AltosTelemetryFile.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.util.*;
@@ -62,7 +63,7 @@ public class AltosTelemetryFile extends AltosStateIterable {
 	}
 
 	public void write(PrintStream out) {
-		
+
 	}
 
 	public AltosTelemetryFile(FileInputStream input) {
@@ -74,7 +75,8 @@ public class AltosTelemetryFile extends AltosStateIterable {
 
 		for (AltosTelemetry telem : telems) {
 			telem.update_state(state);
-			if (state.state >= AltosLib.ao_flight_boost) {
+			state.finish_update();
+			if (state.state() != AltosLib.ao_flight_invalid && state.state() >= AltosLib.ao_flight_boost) {
 				start.set_boost_tick(state.tick);
 				break;
 			}
@@ -88,7 +90,8 @@ public class AltosTelemetryFile extends AltosStateIterable {
 		while (i.hasNext() && !state.valid()) {
 			AltosTelemetry	t = i.next();
 			t.update_state(state);
+			state.finish_update();
 		}
 		return new AltosTelemetryIterator(state, i);
 	}
-}
\ No newline at end of file
+}