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

Fix broken logic when updating fields. 

Fixes https://gitlab.com/kicad/code/kicad/issues/6024
This commit is contained in:
Jeff Young 2020-10-18 00:44:38 +01:00
parent 6dfcfb0177
commit 688a031793
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
eeschema/dialogs/dialog_change_symbols.cpp
View File

@ -501,7 +501,7 @@ bool DIALOG_CHANGE_SYMBOLS::processSymbol( SCH_COMPONENT* aSymbol, SCH_SCREEN* a
SCH_FIELD* field = aSymbol->GetField( (int) i ) ;
LIB_FIELD* libField = nullptr;
if( alg::contains( m_updateFields, field->GetName() ) )
if( !alg::contains( m_updateFields, field->GetName() ) )
continue;
if( i < MANDATORY_FIELDS )
@ -511,8 +511,15 @@ bool DIALOG_CHANGE_SYMBOLS::processSymbol( SCH_COMPONENT* aSymbol, SCH_SCREEN* a
if( libField )
{
if( resetEmpty && libField->GetText().IsEmpty() )
field->SetText( wxEmptyString );
if( libField->GetText().IsEmpty() )
{
if( resetEmpty )
field->SetText( wxEmptyString );
}
else
{
field->SetText( libField->GetText() );
}
if( resetVis )
field->SetVisible( libField->IsVisible() );