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

Check known m_Desc field before m_Fields. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16971

(cherry picked from commit 25291d6e3a)
This commit is contained in:
Jeff Young 2024-02-18 21:13:54 +00:00 committed by Roberto Fernandez Bautista
parent ca3cd706e5
commit 2cd9fbab9d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/lib_tree_model_adapter.cpp
View File

@ -674,10 +674,10 @@ void LIB_TREE_MODEL_ADAPTER::GetValue( wxVariant& aVariant,
{ {
const wxString& key = m_colIdxMap.at( aCol ); const wxString& key = m_colIdxMap.at( aCol );
if( node->m_Fields.count( key ) ) if( key == wxT( "Description" ) )
valueStr = UnescapeString( node->m_Fields.at( key ) );
else if( key == wxT( "Description" ) )
valueStr = UnescapeString( node->m_Desc ); valueStr = UnescapeString( node->m_Desc );
else if( node->m_Fields.count( key ) )
valueStr = UnescapeString( node->m_Fields.at( key ) );
else else
valueStr = wxEmptyString; valueStr = wxEmptyString;
} }

6
eeschema/symbol_tree_synchronizing_adapter.cpp
View File

@ -282,10 +282,10 @@ void SYMBOL_TREE_SYNCHRONIZING_ADAPTER::GetValue( wxVariant& aVariant, wxDataVie
wxString valueStr; wxString valueStr;
if( node->m_Fields.count( key ) ) if( key == wxT( "Description" ) )
valueStr = node->m_Fields.at( key );
else if( key == wxT( "Description" ) )
valueStr = node->m_Desc; valueStr = node->m_Desc;
else if( node->m_Fields.count( key ) )
valueStr = node->m_Fields.at( key );
else else
valueStr = wxEmptyString; valueStr = wxEmptyString;