Missing fixes for the revision 5301.

pcbnew/class_board_connected_item.cpp

@@ -38,8 +38,6 @@ BOARD_CONNECTED_ITEM::BOARD_CONNECTED_ITEM( BOARD_ITEM* aParent, KICAD_T idtype
     BOARD_ITEM( aParent, idtype ), m_netinfo( &NETINFO_LIST::ORPHANED ),
     m_Subnet( 0 ), m_ZoneSubnet( 0 )
 {
-    // The unconnected net is set only in case the item belongs to a BOARD
-    SetNetCode( NETINFO_LIST::UNCONNECTED );
 }
 
 
@@ -52,12 +50,15 @@ BOARD_CONNECTED_ITEM::BOARD_CONNECTED_ITEM( const BOARD_CONNECTED_ITEM& aItem )
 
 void BOARD_CONNECTED_ITEM::SetNetCode( int aNetCode )
 {
+    assert( aNetCode >= 0 );
     BOARD* board = GetBoard();
 
     if( board )
         m_netinfo = board->FindNet( aNetCode );
     else
         m_netinfo = &NETINFO_LIST::ORPHANED;
+
+    assert( m_netinfo );
 }
 
 

pcbnew/router/pns_router.cpp

@@ -698,7 +698,7 @@ void PNS_ROUTER::CommitRouting( PNS_NODE* aNode )
             track->SetEnd( wxPoint( s.B.x, s.B.y ) );
             track->SetWidth( seg->Width() );
             track->SetLayer( ToLAYER_ID( seg->Layers().Start() ) );
-            track->SetNetCode( seg->Net() );
+            track->SetNetCode( seg->Net() > 0 ? seg->Net() : 0 );
             newBI = track;
             break;
         }
@@ -710,7 +710,7 @@ void PNS_ROUTER::CommitRouting( PNS_NODE* aNode )
             via_board->SetPosition( wxPoint( via->Pos().x, via->Pos().y ) );
             via_board->SetWidth( via->Diameter() );
             via_board->SetDrill( via->Drill() );
-            via_board->SetNetCode( via->Net() );
+            via_board->SetNetCode( via->Net() > 0 ? seg->Net() : 0 );
             via_board->SetViaType( via->ViaType() ); // MUST be before SetLayerPair()
             via_board->SetLayerPair( ToLAYER_ID( via->Layers().Start() ),
                                      ToLAYER_ID( via->Layers().End() ) );