From 256d7b07140a43cd6609920b3ec43e84202d2c0b Mon Sep 17 00:00:00 2001 From: Jon Evans Date: Sun, 2 Jun 2019 11:34:01 -0400 Subject: [PATCH] ERC: Use local paths for bus<>bus entry testing Fixes: lp:1831365 * https://bugs.launchpad.net/kicad/+bug/1831365 --- 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 601b562b93..287eafcccc 100644 --- a/eeschema/connection_graph.cpp +++ b/eeschema/connection_graph.cpp @@ -2025,17 +2025,17 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH bus_wire = bus_entry->m_connected_bus_item; conflict = true; - auto test_name = bus_entry->Connection( sheet )->Name(); + auto test_name = bus_entry->Connection( sheet )->Name( true ); for( const auto& member : bus_wire->Connection( sheet )->Members() ) { if( member->Type() == CONNECTION_BUS ) { for( const auto& sub_member : member->Members() ) - if( sub_member->Name() == test_name ) + if( sub_member->Name( true ) == test_name ) conflict = false; } - else if( member->Name() == test_name ) + else if( member->Name( true ) == test_name ) { conflict = false; } @@ -2048,9 +2048,9 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH { msg.Printf( _( "%s (%s) is connected to %s (%s) but is not a member of the bus" ), bus_entry->GetSelectMenuText( m_frame->GetUserUnits() ), - bus_entry->Connection( sheet )->Name(), + bus_entry->Connection( sheet )->Name( true ), bus_wire->GetSelectMenuText( m_frame->GetUserUnits() ), - bus_wire->Connection( sheet )->Name() ); + bus_wire->Connection( sheet )->Name( true ) ); auto marker = new SCH_MARKER(); marker->SetTimeStamp( GetNewTimeStamp() );