diff options
| author | Anthony Towns <aj@erisian.com.au> | 2010-11-20 17:40:49 +1000 |
|---|---|---|
| committer | Anthony Towns <aj@erisian.com.au> | 2010-11-20 17:40:49 +1000 |
| commit | 081fbd5715f9d3d81d98e149fb95d40447c07a79 (patch) | |
| tree | 073885e98179ef663f08aaaf52cb7e74c2c66427 /ao-tools/altosui/AltosFlashUI.java | |
| parent | 90b9bc4475011bead7117ed72fa5efa0f77b2813 (diff) | |
| parent | 7920ed5c34b088f45ce4213b061ddd1ffe22cee8 (diff) | |
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
Conflicts:
ao-tools/altosui/AltosFlightUI.java
Diffstat (limited to 'ao-tools/altosui/AltosFlashUI.java')
| -rw-r--r-- | ao-tools/altosui/AltosFlashUI.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ao-tools/altosui/AltosFlashUI.java b/ao-tools/altosui/AltosFlashUI.java index b09cb594..f63097ac 100644 --- a/ao-tools/altosui/AltosFlashUI.java +++ b/ao-tools/altosui/AltosFlashUI.java @@ -90,7 +90,7 @@ public class AltosFlashUI } catch (AltosSerialInUseException si) { JOptionPane.showMessageDialog(frame, String.format("Device \"%s\" already in use", - debug_dongle.getPath()), + debug_dongle.toShortString()), "Device in use", JOptionPane.ERROR_MESSAGE); } catch (IOException e) { |