Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox

Conflicts:
	ao-tools/altosui/AltosFlightUI.java

1 files changed, 3 insertions, 3 deletions

diff --git a/ao-tools/altosui/AltosTelemetryReader.java b/ao-tools/altosui/AltosTelemetryReader.java
index 03e694f8..ff02c722 100644
--- a/ao-tools/altosui/AltosTelemetryReader.java
+++ b/ao-tools/altosui/AltosTelemetryReader.java
@@ -50,14 +50,14 @@ class AltosTelemetryReader extends AltosFlightReader {
 		serial.set_callsign(callsign);
 	}
 
-	public AltosTelemetryReader (AltosDevice in_device) throws FileNotFoundException, IOException {
+	public AltosTelemetryReader (AltosDevice in_device)
+		throws FileNotFoundException, AltosSerialInUseException, IOException {
 		device = in_device;
-		serial = new AltosSerial();
+		serial = new AltosSerial(device);
 		log = new AltosLog(serial);
 		name = device.getPath();
 
 		telem = new LinkedBlockingQueue<AltosLine>();
 		serial.add_monitor(telem);
-        serial.open(device);
 	}
 }