X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosEepromManage.java;h=083c73725d44e4f2fa928ce8532b2fd8f7bb363d;hb=ca036c5616c3e745c0b878ed90618d4ff710c0e5;hp=cd2b74fef448d6816ac25e23f5208ffa2367eb76;hpb=44fb71ca3e5bccd5f601fc5a2d5da7292050b1d6;p=fw%2Faltos diff --git a/altosui/AltosEepromManage.java b/altosui/AltosEepromManage.java index cd2b74fe..083c7372 100644 --- a/altosui/AltosEepromManage.java +++ b/altosui/AltosEepromManage.java @@ -44,7 +44,10 @@ public class AltosEepromManage implements ActionListener { public void finish() { if (serial_line != null) { - serial_line.flush_input(); + try { + serial_line.flush_input(); + } catch (InterruptedException ie) { + } serial_line.close(); serial_line = null; } @@ -206,7 +209,7 @@ public class AltosEepromManage implements ActionListener { if (device != null) { try { serial_line = new AltosSerial(device); - if (!device.matchProduct(Altos.product_telemetrum)) + if (device.matchProduct(Altos.product_basestation)) remote = true; serial_line.set_frame(frame); @@ -216,8 +219,7 @@ public class AltosEepromManage implements ActionListener { t.start(); } catch (FileNotFoundException ee) { JOptionPane.showMessageDialog(frame, - String.format("Cannot open device \"%s\"", - device.toShortString()), + ee.getMessage(), "Cannot open target device", JOptionPane.ERROR_MESSAGE); } catch (AltosSerialInUseException si) {