X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosFlashUI.java;h=f63097ac408ad1f71356311365b487203ce8788f;hb=74cab8503b51ba6fb05a4d12a031c749e870b0ef;hp=86f57a5fb3c862e755f1909c4310357e7b59bc09;hpb=b9623f8ef26491e9fa14e2478295fe6f5cbbd87f;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosFlashUI.java b/ao-tools/altosui/AltosFlashUI.java
index 86f57a5f..f63097ac 100644
--- a/ao-tools/altosui/AltosFlashUI.java
+++ b/ao-tools/altosui/AltosFlashUI.java
@@ -28,9 +28,6 @@ import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import altosui.AltosHexfile;
-import altosui.AltosFlash;
-
 public class AltosFlashUI
 	extends JDialog
 	implements Runnable, ActionListener
@@ -68,10 +65,9 @@ public class AltosFlashUI
 	}
 
 	public void run() {
-		flash = new AltosFlash(file, debug_dongle);
-		flash.addActionListener(this);
 		try {
-			flash.open();
+			flash = new AltosFlash(file, debug_dongle);
+			flash.addActionListener(this);
 			AltosRomconfigUI romconfig_ui = new AltosRomconfigUI (frame);
 
 			romconfig_ui.set(flash.romconfig());
@@ -91,6 +87,12 @@ public class AltosFlashUI
 						      "Cannot open image",
 						      file.toString(),
 						      JOptionPane.ERROR_MESSAGE);
+		} catch (AltosSerialInUseException si) {
+			JOptionPane.showMessageDialog(frame,
+						      String.format("Device \"%s\" already in use",
+								    debug_dongle.toShortString()),
+						      "Device in use",
+						      JOptionPane.ERROR_MESSAGE);
 		} catch (IOException e) {
 			JOptionPane.showMessageDialog(frame,
 						      e.getMessage(),