Skip to content

Commit ad03360

Browse files
committed
fix device sections shadowing parse errors
1 parent 3914672 commit ad03360

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

src/config/ConfigManager.cpp

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -159,17 +159,15 @@ void CConfigManager::init() {
159159

160160
void CConfigManager::configSetValueSafe(const std::string& COMMAND, const std::string& VALUE) {
161161
if (configValues.find(COMMAND) == configValues.end()) {
162-
if (COMMAND[0] == '$') {
163-
// register a dynamic var
164-
Debug::log(LOG, "Registered dynamic var \"%s\" -> %s", COMMAND.c_str(), VALUE.c_str());
165-
configDynamicVars[COMMAND.substr(1)] = VALUE;
166-
} else {
167-
parseError = "Error setting value <" + VALUE + "> for field <" + COMMAND + ">: No such field.";
168-
}
162+
if (COMMAND.find("device:") != 0 /* devices parsed later */) {
163+
if (COMMAND[0] == '$') {
164+
// register a dynamic var
165+
Debug::log(LOG, "Registered dynamic var \"%s\" -> %s", COMMAND.c_str(), VALUE.c_str());
166+
configDynamicVars[COMMAND.substr(1)] = VALUE;
167+
} else {
168+
parseError = "Error setting value <" + VALUE + "> for field <" + COMMAND + ">: No such field.";
169+
}
169170

170-
if (COMMAND.find("device:") == 0 /* devices parsed later */) {
171-
parseError = "";
172-
} else {
173171
return;
174172
}
175173
}

0 commit comments

Comments
 (0)