From: Keith Packard <keithp@keithp.com>
Date: Tue, 24 Aug 2010 11:01:47 +0000 (-0700)
Subject: altosui: always display romconfig ui while flashing
X-Git-Tag: debian/0.6+373+gcf65c6b~19
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=220f3afdaa432c65f8ad45be7cdbe5c8a3616db3

altosui: always display romconfig ui while flashing
---

diff --git a/ao-tools/altosui/AltosFlashUI.java b/ao-tools/altosui/AltosFlashUI.java
index b88a16b3..73a97a6b 100644
--- a/ao-tools/altosui/AltosFlashUI.java
+++ b/ao-tools/altosui/AltosFlashUI.java
@@ -72,14 +72,15 @@ 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;
-				flash.set_romconfig(romconfig);
-			}
+			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());