X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosFlashUI.java;h=18795695640e2630218259602f999002a550213b;hb=9a690c9795e8257d2a3225f905117681668a472f;hp=73a97a6b9177d29c073153bd32a4d37333a88607;hpb=2f07ad14a16dbf1b75c71784ceae303825c90ade;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosFlashUI.java b/ao-tools/altosui/AltosFlashUI.java
index 73a97a6b..18795695 100644
--- a/ao-tools/altosui/AltosFlashUI.java
+++ b/ao-tools/altosui/AltosFlashUI.java
@@ -75,17 +75,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 +97,8 @@ public class AltosFlashUI
 						      file.toString(),
 						      JOptionPane.ERROR_MESSAGE);
 		} catch (InterruptedException ie) {
+		} finally {
+			abort();
 		}
 		dispose();
 	}