X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosEepromManage.java;h=0652ca0498c06a401a589dbc838ff35a2648399a;hb=18369c58e62bc64b969a7cf8be3103aa33c6d4aa;hp=5fb70a8413cba0e1e5b9be39f4421b46cc3467a8;hpb=573edcd7dfe10ac3251396eae88eece55d82bcb6;p=fw%2Faltos diff --git a/altosui/AltosEepromManage.java b/altosui/AltosEepromManage.java index 5fb70a84..0652ca04 100644 --- a/altosui/AltosEepromManage.java +++ b/altosui/AltosEepromManage.java @@ -168,17 +168,23 @@ public class AltosEepromManage implements ActionListener { AltosEepromManage manage; public void run () { + Runnable r; try { flights = new AltosEepromList(serial_line, remote); - Runnable r = new Runnable() { + r = new Runnable() { public void run() { - manage.got_flights(flights); + got_flights(flights); } }; - SwingUtilities.invokeLater(r); } catch (Exception e) { - manage.got_exception(e); + final Exception f_e = e; + r = new Runnable() { + public void run() { + got_exception(f_e); + } + }; } + SwingUtilities.invokeLater(r); } public EepromGetList(AltosEepromManage in_manage) { @@ -191,7 +197,7 @@ public class AltosEepromManage implements ActionListener { boolean running = false; frame = given_frame; - device = AltosDeviceDialog.show(frame, AltosDevice.product_any); + device = AltosDeviceDialog.show(frame, Altos.product_any); remote = false; any_download = false; @@ -200,7 +206,7 @@ public class AltosEepromManage implements ActionListener { if (device != null) { try { serial_line = new AltosSerial(device); - if (!device.matchProduct(AltosDevice.product_telemetrum)) + if (device.matchProduct(Altos.product_basestation)) remote = true; serial_line.set_frame(frame);