diff options
| author | Keith Packard <keithp@keithp.com> | 2011-03-27 00:46:19 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-03-27 00:46:19 -0700 |
| commit | f23d0f3cbf1fb0c8eab497e266625f6410b69ba3 (patch) | |
| tree | 5f1fbd5b8f8f7511143a167081d4d3015e99be16 | |
| parent | 067b21993e9a97fceadb355e571e5610535336a8 (diff) | |
altosui: Tell serial device which frame to use for timeout dialogs
For the timeout dialog to appear, a frame must be configured for it to
appear near. This patch sends the frame from the eeprom download
functions to the serial code. That path doesn't yet work as the eeprom
download is still trying to talk to the serial device from the swing
event thread, which prevents the cancel dialog from working.
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | altosui/AltosEepromDownload.java | 1 | ||||
| -rw-r--r-- | altosui/AltosEepromManage.java | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java index a03d2b43..fad16460 100644 --- a/altosui/AltosEepromDownload.java +++ b/altosui/AltosEepromDownload.java @@ -328,6 +328,7 @@ public class AltosEepromDownload implements Runnable { frame = given_frame; serial_line = given_serial_line; + serial_line.set_frame(frame); remote = given_remote; flights = given_flights; success = false; diff --git a/altosui/AltosEepromManage.java b/altosui/AltosEepromManage.java index b12d95fa..fe1db9c7 100644 --- a/altosui/AltosEepromManage.java +++ b/altosui/AltosEepromManage.java @@ -106,6 +106,8 @@ public class AltosEepromManage implements ActionListener { if (!device.matchProduct(AltosDevice.product_telemetrum)) remote = true; + serial_line.set_frame(frame); + flights = new AltosEepromList(serial_line, remote); if (flights.size() == 0) { |