use multimaint-merge to make Debian changelogs less ugly

[fw/altos] / altosui / AltosEepromManage.java

diff --git a/altosui/AltosEepromManage.java b/altosui/AltosEepromManage.java
index cd2b74fef448d6816ac25e23f5208ffa2367eb76..2e5206280b1e308e5aef46d5358faefc4b769835 100644 (file)
--- a/altosui/AltosEepromManage.java
+++ b/altosui/AltosEepromManage.java
@@ -44,7 +44,10 @@ public class AltosEepromManage implements ActionListener {
 
        public void finish() {
                if (serial_line != null) {
 
        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;
                }
                        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 != 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);
                                        remote = true;
 
                                serial_line.set_frame(frame);