From 01c5bdfb8f49a84f2e5fae5c7fc5729a47c8ef0f Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Fri, 6 Jul 2018 20:36:31 -0600 Subject: [PATCH] Fix bug with duplicate columns in Edit Symbol Fields. --- eeschema/dialogs/dialog_fields_editor_global.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eeschema/dialogs/dialog_fields_editor_global.cpp b/eeschema/dialogs/dialog_fields_editor_global.cpp index 45d824c8e2..43e0cc097c 100644 --- a/eeschema/dialogs/dialog_fields_editor_global.cpp +++ b/eeschema/dialogs/dialog_fields_editor_global.cpp @@ -699,8 +699,10 @@ void DIALOG_FIELDS_EDITOR_GLOBAL::LoadFieldNames() for( auto fieldName : userFieldNames ) AddField( fieldName, true, false ); + // Add any templateFieldNames which aren't already present in the userFieldNames 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 ); }