7
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-14 13:19:34 +00:00

connectivity: treat empty FPIDs as matching in TOPO_MATCH

This commit is contained in:
Tomasz Wlostowski 2025-03-06 23:23:09 +01:00
parent 8192ba73d9
commit b1bf5127fa

View File

@ -536,7 +536,9 @@ COMPONENT::COMPONENT( const wxString& aRef, FOOTPRINT* aParentFp, std::optional<
bool COMPONENT::IsSameKind( const COMPONENT& b ) const
{
return m_prefix == b.m_prefix && m_parentFootprint->GetFPID() == b.m_parentFootprint->GetFPID();
return m_prefix == b.m_prefix &&
( (m_parentFootprint->GetFPID() == b.m_parentFootprint->GetFPID() ) ||
( m_parentFootprint->GetFPID().empty() && b.m_parentFootprint->GetFPID().empty() ) );
}
void COMPONENT::AddPin( PIN* aPin )
@ -552,12 +554,7 @@ bool COMPONENT::MatchesWith( COMPONENT* b )
return false;
}
if( m_parentFootprint->GetFPID() != b->m_parentFootprint->GetFPID() )
{
return false;
}
if( m_prefix != b->m_prefix )
if( !IsSameKind( *b ) )
{
return false;
}