X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosFlashUI.java;h=70c8c5490106ad9b5a7a5732286fb7b39262ac55;hb=8463ffcaca6bcd31e645aba71c171f548dce96d8;hp=73a97a6b9177d29c073153bd32a4d37333a88607;hpb=220f3afdaa432c65f8ad45be7cdbe5c8a3616db3;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosFlashUI.java b/ao-tools/altosui/AltosFlashUI.java
index 73a97a6b..70c8c549 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
@@ -75,17 +72,17 @@ public class AltosFlashUI
 			AltosRomconfigUI romconfig_ui = new AltosRomconfigUI (frame);
 
 			romconfig_ui.set(flash.romconfig());
-			romconfig_ui.showDialog();
-
-			AltosRomconfig romconfig = romconfig_ui.romconfig();
-			if (romconfig == null || !romconfig.valid())
-				return;
-			flash.set_romconfig(romconfig);
-			serial_value.setText(String.format("%d",
-							   flash.romconfig().serial_number));
-			file_value.setText(file.toString());
-			setVisible(true);
-			flash.flash();
+			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;
+			}
 		} catch (FileNotFoundException ee) {
 			JOptionPane.showMessageDialog(frame,
 						      "Cannot open image",
@@ -97,6 +94,8 @@ public class AltosFlashUI
 						      file.toString(),
 						      JOptionPane.ERROR_MESSAGE);
 		} catch (InterruptedException ie) {
+		} finally {
+			abort();
 		}
 		dispose();
 	}
@@ -185,13 +184,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);
@@ -201,6 +204,9 @@ public class AltosFlashUI
 
 		file = hexfile_chooser.getSelectedFile();
 
+		if (file != null)
+			AltosPreferences.set_firmwaredir(file.getParentFile());
+
 		thread = new Thread(this);
 		thread.start();
 	}