Commit f2119766 authored by Evan W. Patton's avatar Evan W. Patton Committed by Jeffrey Schiller

Ignore empty/null values for ColorPropertyPicker

Change-Id: I904a77812093a34d2b5cabf792b157e048ab6bb0
parent f4135e10
...@@ -240,6 +240,12 @@ public abstract class ColorChoicePropertyEditor extends PropertyEditor { ...@@ -240,6 +240,12 @@ public abstract class ColorChoicePropertyEditor extends PropertyEditor {
// When receiving the property values from the server hex numbers were converted to decimal // When receiving the property values from the server hex numbers were converted to decimal
// numbers // numbers
String propertyValue = property.getValue(); String propertyValue = property.getValue();
// Screens can be loaded in an arbitrary order and if Screen1 is not the first screen loaded,
// then a value of "" will be sent. Just ignore it because it will be corrected after Screen1
// is loaded.
if (propertyValue == null || propertyValue.isEmpty()) {
return;
}
int radix = 10; int radix = 10;
if (propertyValue.startsWith(hexPrefix)) { if (propertyValue.startsWith(hexPrefix)) {
propertyValue = propertyValue.substring(hexPrefix.length()); propertyValue = propertyValue.substring(hexPrefix.length());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment