diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index 0ca66111a5..6996ca58b1 100644 Binary files a/java_tools/ConfigDefinition.jar and b/java_tools/ConfigDefinition.jar differ diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigField.java b/java_tools/configuration_definition/src/com/rusefi/ConfigField.java index 1ae9936856..68fcf8baab 100644 --- a/java_tools/configuration_definition/src/com/rusefi/ConfigField.java +++ b/java_tools/configuration_definition/src/com/rusefi/ConfigField.java @@ -59,7 +59,7 @@ public class ConfigField { this.type = type; this.arraySizeVariableName = arraySizeAsText; this.arraySize = arraySize; - this.tsInfo = tsInfo; + this.tsInfo = VariableRegistry.INSTANCE.applyVariables(tsInfo); this.isIterate = isIterate; } diff --git a/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java b/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java index 3ec4f9a027..92dbc80c6c 100644 --- a/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java +++ b/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java @@ -32,6 +32,8 @@ public class VariableRegistry extends TreeMap { * @return string with variable values inlined */ public String applyVariables(String line) { + if (line == null) + return null; Matcher m; while ((m = VAR.matcher(line)).find()) { String key = m.group(2);