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

diff --git a/ao-tools/altosui/AltosFlashUI.java b/ao-tools/altosui/AltosFlashUI.java
index b88a16b3..86f57a5f 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,13 +187,17 @@ 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;
 
 		JFileChooser	hexfile_chooser = new JFileChooser();
 
+		File firmwaredir = AltosPreferences.firmwaredir();
+		if (firmwaredir != null)
+			hexfile_chooser.setCurrentDirectory(firmwaredir);
+
 		hexfile_chooser.setDialogTitle("Select Flash Image");
 		hexfile_chooser.setFileFilter(new FileNameExtensionFilter("Flash Image", "ihx"));
 		int returnVal = hexfile_chooser.showOpenDialog(frame);
@@ -200,6 +207,9 @@ public class AltosFlashUI
 
 		file = hexfile_chooser.getSelectedFile();
 
+		if (file != null)
+			AltosPreferences.set_firmwaredir(file.getParentFile());
+
 		thread = new Thread(this);
 		thread.start();
 	}