X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosTelemetryReader.java;h=cd5a08c4d379d97bcb432fbae8f4a4b9cc1abd6d;hp=5ed501348b07174bb0debee09d499ada26bffb56;hb=519d477cb752d9cdba78a4daa32b1f547bf889b4;hpb=55e6558fa7cb23fb1363a86c83fbd6abf67ea324

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index 5ed50134..cd5a08c4 100644
--- a/altoslib/AltosTelemetryReader.java
+++ b/altoslib/AltosTelemetryReader.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_7;
 
 import java.text.*;
 import java.io.*;
@@ -32,9 +32,12 @@ public class AltosTelemetryReader extends AltosFlightReader {
 	LinkedBlockingQueue<AltosLine> telem;
 
 	public AltosState read() throws InterruptedException, ParseException, AltosCRCException, IOException {
-		AltosLine l = telem.take();
-		if (l.line == null)
-			throw new IOException("IO error");
+		AltosLine l;
+		do {
+			l = telem.take();
+			if (l.line == null)
+				throw new IOException("IO error");
+		} while (!link.get_monitor());
 		AltosTelemetry	telem = AltosTelemetry.parse(l.line);
 		if (state == null)
 			state = new AltosState();
@@ -50,9 +53,11 @@ public class AltosTelemetryReader extends AltosFlightReader {
 
 	public void reset() {
 		flush();
+		state = null;
 	}
 
 	public void close(boolean interrupted) {
+
 		link.remove_monitor(telem);
 		log.close();
 		try {