From: Keith Packard <keithp@keithp.com>
Date: Wed, 18 Dec 2013 20:40:22 +0000 (-0800)
Subject: altoslib: Don't close telemetry reader at startup unless something fails
X-Git-Tag: 1.3~13^2~8
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=216405bc49ef2fc0e9941989f054e41f2fef9cfe;hp=f2e589c59ed0a4c586c5accca8772df15010c46a

altoslib: Don't close telemetry reader at startup unless something fails

Was always closing the file, which led to very little telemetry being received.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index 405c555b..eeb35cb5 100644
--- a/altoslib/AltosTelemetryReader.java
+++ b/altoslib/AltosTelemetryReader.java
@@ -124,6 +124,7 @@ public class AltosTelemetryReader extends AltosFlightReader {
 	public AltosTelemetryReader (AltosLink in_link)
 		throws IOException, InterruptedException, TimeoutException {
 		link = in_link;
+		boolean success = false;
 		try {
 			log = new AltosLog(link);
 			name = link.name;
@@ -133,8 +134,10 @@ public class AltosTelemetryReader extends AltosFlightReader {
 			telemetry = AltosPreferences.telemetry(link.serial);
 			set_telemetry(telemetry);
 			link.add_monitor(telem);
+			success = true;
 		} finally {
-			close(true);
+			if (!success)
+				close(true);
 		}
 	}
 }