summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-12-18 12:40:22 -0800
committerKeith Packard <keithp@keithp.com>2013-12-18 12:40:22 -0800
commit216405bc49ef2fc0e9941989f054e41f2fef9cfe (patch)
tree4df038357fa35b4fc29ec2532cde1029edae1df7
parentf2e589c59ed0a4c586c5accca8772df15010c46a (diff)
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>
-rw-r--r--altoslib/AltosTelemetryReader.java5
1 files changed, 4 insertions, 1 deletions
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);
}
}
}