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

Ignore empty field-name-templates. 

Fixes https://gitlab.com/kicad/code/kicad/issues/14552
This commit is contained in:
Jeff Young 2023-04-18 13:45:53 +01:00
parent 955774a91a
commit 4f9e754a51
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/template_fieldnames.cpp
View File

@ -129,7 +129,10 @@ void TEMPLATES::Format( OUTPUTFORMATTER* out, int nestLevel, bool aGlobal ) cons
const TEMPLATE_FIELDNAMES& source = aGlobal ? m_globals : m_project; const TEMPLATE_FIELDNAMES& source = aGlobal ? m_globals : m_project;
for( const TEMPLATE_FIELDNAME& temp : source ) for( const TEMPLATE_FIELDNAME& temp : source )
temp.Format( out, nestLevel+1 ); {
if( !temp.m_Name.IsEmpty() )
temp.Format( out, nestLevel+1 );
}
out->Print( 0, ")\n" ); out->Print( 0, ")\n" );
} }
@ -162,7 +165,8 @@ void TEMPLATES::parse( TEMPLATE_FIELDNAMES_LEXER* in, bool aGlobal )
field.Parse( in ); field.Parse( in );
// add the field // add the field
AddTemplateFieldName( field, aGlobal ); if( !field.m_Name.IsEmpty() )
AddTemplateFieldName( field, aGlobal );
} }
break; break;

5
eeschema/dialogs/panel_template_fieldnames.cpp
View File

@ -185,7 +185,10 @@ bool PANEL_TEMPLATE_FIELDNAMES::TransferDataFromWindow()
m_templateMgr->DeleteAllFieldNameTemplates( m_global ); m_templateMgr->DeleteAllFieldNameTemplates( m_global );
for( const TEMPLATE_FIELDNAME& field : m_fields ) for( const TEMPLATE_FIELDNAME& field : m_fields )
m_templateMgr->AddTemplateFieldName( field, m_global ); {
if( !field.m_Name.IsEmpty() )
m_templateMgr->AddTemplateFieldName( field, m_global );
}
if( m_global ) if( m_global )
{ {