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

fix unique name determination

Browse Source
This commit is contained in:
John
2022-02-05 15:50:46 +01:00
parent 95fb4f6974
commit 815e45234e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/data.h
+5 -2
View File
@@ -647,8 +647,8 @@ class DataFieldSet : public DataField {
* @param name the field name. * @param name the field name.
* @param fields the @a vector of @a SingleDataField instances part of this set. * @param fields the @a vector of @a SingleDataField instances part of this set.
*/ */
DataFieldSet(const string& name, const vector<const SingleDataField*> fields) DataFieldSet(const string& fieldName, const vector<const SingleDataField*> fields)
: DataField(name), m_fields(fields) { : DataField(fieldName), m_fields(fields) {
bool uniqueNames = true; bool uniqueNames = true;
size_t ignoredCount = 0; size_t ignoredCount = 0;
map<string, string> names; map<string, string> names;
@@ -657,6 +657,9 @@ class DataFieldSet : public DataField {
ignoredCount++; ignoredCount++;
continue; continue;
} }
if (!uniqueNames) {
continue;
}
string name = field->getName(-1); string name = field->getName(-1);
if (name.empty() || names.find(name) != names.end()) { if (name.empty() || names.find(name) != names.end()) {
uniqueNames = false; uniqueNames = false;