Fix bug with duplicate columns in Edit Symbol Fields.

(cherry picked from commit 01c5bdf)
This commit is contained in:
Jeff Young 2018-07-07 03:36:31 +01:00
parent 9230189f62
commit f163d9ff2a
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 );
} }