haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Symbol Fields Table: fix duplicated fields 

Fixes: https://gitlab.com/kicad/code/kicad/-/issues/13687
This commit is contained in:
Mike Williams 2023-01-30 09:29:47 -05:00
parent f28339ded8
commit 207b8d3273
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
eeschema/dialogs/dialog_symbol_fields_table.cpp
View File

@ -672,10 +672,9 @@ public:
SCH_FIELD* destField = symbol.FindField( srcName );
// Add a not existing field if it has a value for this symbol
bool createField = !destField && !srcValue.IsEmpty();
if( alg::contains( m_userAddedFields, srcName ) )
createField = true;
bool createField =
!destField
&& ( !srcValue.IsEmpty() || alg::contains( m_userAddedFields, srcName ) );
if( createField )
{
@ -1314,8 +1313,8 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnTableRangeSelected( wxGridRangeSelectEvent& e
{
wxGridCellCoordsArray selectedCells = m_grid->GetSelectedCells();
if( selectedCells.GetCount() == 1 )
{
if( selectedCells.GetCount() == 1 )
{
int row = selectedCells[0].GetRow();
int col = selectedCells[0].GetCol();
@ -1343,7 +1342,7 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnTableRangeSelected( wxGridRangeSelectEvent& e
editor->FindSymbolAndItem( &symbol_path, nullptr, true, HIGHLIGHT_SYMBOL, wxEmptyString );
}
return;
return;
}
}