X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosFlashUI.java;h=5ed417da993a0d149146ff78d039ccb2a5f703c1;hp=b88a16b35b77bf6725e0091c064dbe2c4a0118c2;hb=af200f5b84555de0556b52146379f3934774a3f3;hpb=d93787284c8e514a929edb9f944c98ae0206a33f

diff --git a/ao-tools/altosui/AltosFlashUI.java b/ao-tools/altosui/AltosFlashUI.java
index b88a16b3..5ed417da 100644
--- a/ao-tools/altosui/AltosFlashUI.java
+++ b/ao-tools/altosui/AltosFlashUI.java
@@ -72,19 +72,20 @@ public class AltosFlashUI
 		flash.addActionListener(this);
 		try {
 			flash.open();
-			if (!flash.check_rom_config()) {
-				AltosRomconfigUI romconfig_ui = new AltosRomconfigUI (frame);
-				romconfig_ui.showDialog();
-				AltosRomconfig romconfig = romconfig_ui.romconfig();
-				if (romconfig == null)
-					return;
+			AltosRomconfigUI romconfig_ui = new AltosRomconfigUI (frame);
+
+			romconfig_ui.set(flash.romconfig());
+			AltosRomconfig romconfig = romconfig_ui.showDialog();
+
+			if (romconfig != null && romconfig.valid()) {
 				flash.set_romconfig(romconfig);
+				serial_value.setText(String.format("%d",
+								   flash.romconfig().serial_number));
+				file_value.setText(file.toString());
+				setVisible(true);
+				flash.flash();
+				flash = null;
 			}
-			serial_value.setText(String.format("%d",
-							   flash.romconfig().serial_number));
-			file_value.setText(file.toString());
-			setVisible(true);
-			flash.flash();
 		} catch (FileNotFoundException ee) {
 			JOptionPane.showMessageDialog(frame,
 						      "Cannot open image",
@@ -96,6 +97,8 @@ public class AltosFlashUI
 						      file.toString(),
 						      JOptionPane.ERROR_MESSAGE);
 		} catch (InterruptedException ie) {
+		} finally {
+			abort();
 		}
 		dispose();
 	}
@@ -184,7 +187,7 @@ public class AltosFlashUI
 
 		build_dialog();
 
-		debug_dongle = AltosDeviceDialog.show(frame, AltosDevice.Any);
+		debug_dongle = AltosDeviceDialog.show(frame, AltosDevice.product_any);
 
 		if (debug_dongle == null)
 			return;