altosui: Catch timeout errors when setting up TD telem monitoring

Close the port in this case so it can be used for other things.

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

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index 112e008efff4bd75eb0147f9e3d02eb1d42570a3..911a099af7d33a62183b4d0bc0adeea1217c76c2 100644 (file)
--- a/altoslib/AltosTelemetryReader.java
+++ b/altoslib/AltosTelemetryReader.java
@@ -106,14 +106,22 @@ public class AltosTelemetryReader extends AltosFlightReader {
        public AltosTelemetryReader (AltosLink in_link)
                throws IOException, InterruptedException, TimeoutException {
                link = in_link;
-               log = new AltosLog(link);
-               name = link.name;
-               previous = null;
-               telem = new LinkedBlockingQueue<AltosLine>();
-               frequency = AltosPreferences.frequency(link.serial);
-               set_frequency(frequency);
-               telemetry = AltosPreferences.telemetry(link.serial);
-               set_telemetry(telemetry);
-               link.add_monitor(telem);
+               try {
+                       log = new AltosLog(link);
+                       name = link.name;
+                       previous = null;
+                       telem = new LinkedBlockingQueue<AltosLine>();
+                       frequency = AltosPreferences.frequency(link.serial);
+                       set_frequency(frequency);
+                       telemetry = AltosPreferences.telemetry(link.serial);
+                       set_telemetry(telemetry);
+                       link.add_monitor(telem);
+               } catch (TimeoutException e) {
+                       close(true);
+                       throw(e);
+               } catch (InterruptedException e) {
+                       close(true);
+                       throw(e);
+               }
        }
 }