diff options
| author | Keith Packard <keithp@keithp.com> | 2019-07-16 10:22:02 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2019-07-16 10:22:02 -0700 |
| commit | 9abacdaacf5ad1211da4fc72f5320ba9c43ff509 (patch) | |
| tree | 74d56ad90c44433052edab9e722c3709b242abc4 | |
| parent | a0a109d8c82e7f362253a0f1e52d14843ddec996 (diff) | |
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>
| -rw-r--r-- | altosuilib/AltosFlashUI.java | 2 | ||||
| -rw-r--r-- | altosuilib/AltosRomconfigUI.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/altosuilib/AltosFlashUI.java b/altosuilib/AltosFlashUI.java index ffb39b8c..37ab9661 100644 --- a/altosuilib/AltosFlashUI.java +++ b/altosuilib/AltosFlashUI.java @@ -319,7 +319,7 @@ public class AltosFlashUI 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), diff --git a/altosuilib/AltosRomconfigUI.java b/altosuilib/AltosRomconfigUI.java index fd670d4e..f8dcc3e1 100644 --- a/altosuilib/AltosRomconfigUI.java +++ b/altosuilib/AltosRomconfigUI.java @@ -76,7 +76,7 @@ public class AltosRomconfigUI 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; |