diff options
| author | Bdale Garbee <bdale@gag.com> | 2017-08-28 12:05:57 -0600 | 
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2017-08-28 12:05:57 -0600 | 
| commit | 1afcdb1f26d10f535e4467174688191b0194377e (patch) | |
| tree | ee4412dae28490fb4c1d38631c2fbee9cf44a480 /altoslib/AltosConfigData.java | |
| parent | 5376d4c904de57e289f12ee201690deebe34164b (diff) | |
| parent | b1cf0dab1e28433e06ab02cec033951ea0149ea3 (diff) | |
Merge branch 'branch-1.8' into debian
Diffstat (limited to 'altoslib/AltosConfigData.java')
| -rw-r--r-- | altoslib/AltosConfigData.java | 18 | 
1 files changed, 10 insertions, 8 deletions
| diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java index 97a80bcb..63c34310 100644 --- a/altoslib/AltosConfigData.java +++ b/altoslib/AltosConfigData.java @@ -488,14 +488,16 @@ public class AltosConfigData {  	public boolean mma655x_inverted() throws AltosUnknownProduct { -		if (product.startsWith("EasyMega-v1")) -			return false; -		if (product.startsWith("TeleMetrum-v2")) -			return true; -		if (product.startsWith("TeleMega-v2")) -			return false; -		if (product.startsWith("TeleMega-v1")) -			return false; +		if (product != null) { +			if (product.startsWith("EasyMega-v1")) +				return false; +			if (product.startsWith("TeleMetrum-v2")) +				return true; +			if (product.startsWith("TeleMega-v2")) +				return false; +			if (product.startsWith("TeleMega-v1")) +				return false; +		}  		throw new AltosUnknownProduct(product);  	} | 
