Browse Source

Check known m_Desc field before m_Fields.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16971
8.0
Jeff Young 2 years ago
parent
commit
25291d6e3a
  1. 6
      common/lib_tree_model_adapter.cpp
  2. 6
      eeschema/symbol_tree_synchronizing_adapter.cpp

6
common/lib_tree_model_adapter.cpp

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

6
eeschema/symbol_tree_synchronizing_adapter.cpp

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

Loading…
Cancel
Save