X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosTelemetryReader.java;h=405c555b35b460c27448ca73fae8bb23a12b6c20;hp=aea978445578e536b3daf3a5b1ffc73ffaf3675d;hb=e26306c9350ef1d107d4257ef1c09d15165c9154;hpb=18852efa108ba6e6e69dfd5076d4f4c01f62b4ef

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index aea97844..405c555b 100644
--- a/altoslib/AltosTelemetryReader.java
+++ b/altoslib/AltosTelemetryReader.java
@@ -54,7 +54,10 @@ public class AltosTelemetryReader extends AltosFlightReader {
 	public void close(boolean interrupted) {
 		link.remove_monitor(telem);
 		log.close();
-		link.close();
+		try {
+			link.close();
+		} catch (InterruptedException ie) {
+		}
 	}
 
 	public void set_frequency(double in_frequency) throws InterruptedException, TimeoutException {
@@ -83,7 +86,7 @@ public class AltosTelemetryReader extends AltosFlightReader {
 			else
 				return false;
 		} catch (InterruptedException ie) {
-			return true;
+			return false;
 		} catch (TimeoutException te) {
 			return true;
 		}
@@ -114,7 +117,7 @@ public class AltosTelemetryReader extends AltosFlightReader {
 		return link.has_monitor_battery();
 	}
 
-	public double monitor_battery() {
+	public double monitor_battery() throws InterruptedException {
 		return link.monitor_battery();
 	}
 
@@ -130,12 +133,8 @@ public class AltosTelemetryReader extends AltosFlightReader {
 			telemetry = AltosPreferences.telemetry(link.serial);
 			set_telemetry(telemetry);
 			link.add_monitor(telem);
-		} catch (TimeoutException e) {
-			close(true);
-			throw(e);
-		} catch (InterruptedException e) {
+		} finally {
 			close(true);
-			throw(e);
 		}
 	}
 }