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

Repair earlier fix for VVIAs.

This commit is contained in:
Jeff Young 2023-12-19 16:47:44 +00:00
parent 33a56c530d
commit 24846d3f44
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pcbnew/router/pns_joint.h
View File

@ -126,17 +126,17 @@ public:
if( item->IsVirtual() ) if( item->IsVirtual() )
continue; continue;
if( item->Kind() == VIA_T ) if( item->Kind() == SEGMENT_T || item->Kind() == ARC_T )
{
return false;
}
else if( item->Kind() == SEGMENT_T || item->Kind() == ARC_T )
{ {
if( !seg1 ) if( !seg1 )
seg1 = static_cast<const LINKED_ITEM*>( item ); seg1 = static_cast<const LINKED_ITEM*>( item );
else else
seg2 = static_cast<const LINKED_ITEM*>( item ); seg2 = static_cast<const LINKED_ITEM*>( item );
} }
else
{
return false;
}
} }
wxCHECK( seg1 && seg2, false ); wxCHECK( seg1 && seg2, false );

2
pcbnew/router/pns_node.cpp
View File

@ -1085,7 +1085,7 @@ const LINE NODE::AssembleLine( LINKED_ITEM* aSeg, int* aOriginSegmentIndex,
if( aOriginSegmentIndex && *aOriginSegmentIndex >= pl.SegmentCount() ) if( aOriginSegmentIndex && *aOriginSegmentIndex >= pl.SegmentCount() )
*aOriginSegmentIndex = pl.SegmentCount() - 1; *aOriginSegmentIndex = pl.SegmentCount() - 1;
assert( pl.SegmentCount() != 0 ); wxASSERT_MSG( pl.SegmentCount() != 0, "assembled line should never be empty" );
return pl; return pl;
} }