From ba537209abf64909bc5d58122a2e883227088c80 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Fri, 31 Jul 2020 16:46:45 +0100
Subject: [PATCH] Make sure pasted items get their netclass updated along with
 their net.

Fixes https://gitlab.com/kicad/code/kicad/issues/4974
---
 pcbnew/board_connected_item.h | 1 -
 pcbnew/class_board.cpp        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pcbnew/board_connected_item.h b/pcbnew/board_connected_item.h
index 5a435e29eb..bc8b5be1df 100644
--- a/pcbnew/board_connected_item.h
+++ b/pcbnew/board_connected_item.h
@@ -89,7 +89,6 @@ public:
      */
     void SetNet( NETINFO_ITEM* aNetInfo )
     {
-        wxASSERT( aNetInfo->GetBoard() == GetBoard() || aNetInfo == NETINFO_LIST::OrphanedItem() );
         m_netinfo = aNetInfo;
     }
 
diff --git a/pcbnew/class_board.cpp b/pcbnew/class_board.cpp
index 5bcc41977d..37704d9cd2 100644
--- a/pcbnew/class_board.cpp
+++ b/pcbnew/class_board.cpp
@@ -1866,7 +1866,7 @@ void BOARD::MapNets( const BOARD* aDestBoard )
         NETINFO_ITEM* netInfo = aDestBoard->FindNet( item->GetNetname() );
 
         if( netInfo )
-            item->SetNetCode( netInfo->GetNet() );
+            item->SetNet( netInfo );
         else
             item->SetNetCode( 0 );
     }