altosuilib: Don't crash when flashing an unknown device

An unknown device will not have a config; check for that before
showing radio calibration dialogs.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altosuilib/AltosFlashUI.java b/altosuilib/AltosFlashUI.java
index ffb39b8c2aae4e4e7b2035a9e780355114808bf8..37ab96614af52f73d4ab116aa9c39f9d457f480e 100644 (file)
--- a/altosuilib/AltosFlashUI.java
+++ b/altosuilib/AltosFlashUI.java
@@ -319,7 +319,7 @@ public class AltosFlashUI
                                return false;
                }
 
                                return false;
                }
 

-               if (existing_config.radio_calibration_broken) {
+               if (existing_config != null && existing_config.radio_calibration_broken) {

                        int ret = JOptionPane.showConfirmDialog(this,
                                                                String.format("Radio calibration value %d may be incorrect\nFlash anyways?",
                                                                              existing_config.radio_calibration),
                        int ret = JOptionPane.showConfirmDialog(this,
                                                                String.format("Radio calibration value %d may be incorrect\nFlash anyways?",
                                                                              existing_config.radio_calibration),

diff --git a/altosuilib/AltosRomconfigUI.java b/altosuilib/AltosRomconfigUI.java
index fd670d4ec9df439081ee7533662989f9e2223083..f8dcc3e1fe9ba83e8f21ca819b5673407a7c0d68 100644 (file)
--- a/altosuilib/AltosRomconfigUI.java
+++ b/altosuilib/AltosRomconfigUI.java
@@ -76,7 +76,7 @@ public class AltosRomconfigUI
 
                y++;
 
 
                y++;
 

-               if (AltosLib.has_radio(config.usb_id.pid)) {
+               if (config == null || AltosLib.has_radio(config.usb_id.pid)) {

                        /* Radio calibration value */
                        c = new GridBagConstraints();
                        c.gridx = 0; c.gridy = y;
                        /* Radio calibration value */
                        c = new GridBagConstraints();
                        c.gridx = 0; c.gridy = y;