From 7015f4cf75e2b8262391681e796089ed06c5816f Mon Sep 17 00:00:00 2001 From: Jon Evans Date: Sat, 13 Feb 2021 10:09:16 -0500 Subject: [PATCH] Use full names for bus membership ERC checking Fixes https://gitlab.com/kicad/code/kicad/-/issues/7522 --- eeschema/connection_graph.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eeschema/connection_graph.cpp b/eeschema/connection_graph.cpp index 1b05f47e32..9acf4fee93 100644 --- a/eeschema/connection_graph.cpp +++ b/eeschema/connection_graph.cpp @@ -2417,9 +2417,9 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH { conflict = true; // Assume a conflict; we'll reset if we find it's OK - bus_name = bus_wire->Connection( &sheet )->Name( true ); + bus_name = bus_wire->Connection( &sheet )->Name(); - wxString test_name = bus_entry->Connection( &sheet )->Name( true ); + wxString test_name = bus_entry->Connection( &sheet )->Name(); for( const auto& member : bus_wire->Connection( &sheet )->Members() ) { @@ -2427,11 +2427,11 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH { for( const auto& sub_member : member->Members() ) { - if( sub_member->Name( true ) == test_name ) + if( sub_member->Name() == test_name ) conflict = false; } } - else if( member->Name( true ) == test_name ) + else if( member->Name() == test_name ) { conflict = false; } @@ -2447,7 +2447,7 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH if( conflict ) { - wxString netName = aSubgraph->m_driver_connection->Name( true ); + wxString netName = aSubgraph->m_driver_connection->Name(); wxString msg = wxString::Format( _( "Net %s is graphically connected to bus %s but is not a" " member of that bus" ), UnescapeString( netName ),