Was using the rom config class wrong, causing cancel actions to work
just like 'ok' actions. Oops.
Signed-off-by: Keith Packard <keithp@keithp.com>
AltosRomconfigUI romconfig_ui = new AltosRomconfigUI (frame);
romconfig_ui.set(flash.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());
- 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",
} catch (FileNotFoundException ee) {
JOptionPane.showMessageDialog(frame,
"Cannot open image",
file.toString(),
JOptionPane.ERROR_MESSAGE);
} catch (InterruptedException ie) {
file.toString(),
JOptionPane.ERROR_MESSAGE);
} catch (InterruptedException ie) {