From: Keith Packard <keithp@keithp.com>
Date: Tue, 16 Jul 2019 17:22:02 +0000 (-0700)
Subject: altosuilib: Don't crash when flashing an unknown device
X-Git-Tag: 1.9.1~1^2~63
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=9abacdaacf5ad1211da4fc72f5320ba9c43ff509;ds=sidebyside

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 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;