Fix bug with duplicate columns in Edit Symbol Fields.

This commit is contained in:
Jeff Young 2018-07-06 20:36:31 -06:00
parent 1a22918795
commit 01c5bdfb8f
1 changed files with 3 additions and 1 deletions

View File

@ -699,8 +699,10 @@ void DIALOG_FIELDS_EDITOR_GLOBAL::LoadFieldNames()
for( auto fieldName : userFieldNames ) for( auto fieldName : userFieldNames )
AddField( fieldName, true, false ); AddField( fieldName, true, false );
// Add any templateFieldNames which aren't already present in the userFieldNames
for( auto templateFieldName : m_parent->GetTemplateFieldNames() ) for( auto templateFieldName : m_parent->GetTemplateFieldNames() )
AddField( templateFieldName.m_Name, false, false ); if( userFieldNames.count( templateFieldName.m_Name ) == 0 )
AddField( templateFieldName.m_Name, false, false );
} }