nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow empty field list, allow templates to override each other

Browse Source
This commit is contained in:
john30
2014-12-26 19:45:31 +01:00
parent e75aedcf2b
commit 7a394bc13b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/data.cpp
+2 -2
View File
@@ -356,7 +356,7 @@ result_t DataField::create(vector<string>::iterator& it,
} while (it != end && result == RESULT_OK); } while (it != end && result == RESULT_OK);
if (fields.empty() == true || result != RESULT_OK) { if (result != RESULT_OK) {
while (fields.empty() == false) { // cleanup already created fields while (fields.empty() == false) { // cleanup already created fields
delete fields.back(); delete fields.back();
fields.pop_back(); fields.pop_back();
@@ -1246,7 +1246,7 @@ result_t DataFieldTemplates::addFromFile(vector<string>::iterator& begin, const
if (result != RESULT_OK) if (result != RESULT_OK)
return result; return result;
result = add(field); result = add(field, true);
if (result != RESULT_OK) if (result != RESULT_OK)
delete field; delete field;