From 9d96edc44f8331b04282d4e2e8ebc95465e455f4 Mon Sep 17 00:00:00 2001
From: Alex <dudesuchamazing@gmail.com>
Date: Thu, 23 Feb 2023 22:09:53 +0300
Subject: [PATCH] Print original netnames properly when reconnecting
 zones/vias.

Using GetNetname() after SetNet() isn't a good idea to get the original
name when updating PCB from Schematic.
---
 .../netlist_reader/board_netlist_updater.cpp  | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pcbnew/netlist_reader/board_netlist_updater.cpp b/pcbnew/netlist_reader/board_netlist_updater.cpp
index 3ad04239dc..c083b30675 100644
--- a/pcbnew/netlist_reader/board_netlist_updater.cpp
+++ b/pcbnew/netlist_reader/board_netlist_updater.cpp
@@ -650,8 +650,10 @@ bool BOARD_NETLIST_UPDATER::updateCopperZoneNets( NETLIST& aNetlist )
             {
                 if( m_isDryRun )
                 {
+                    wxString originalNetname = via->GetNetname();
+
                     msg.Printf( _( "Reconnect via from %s to %s." ),
-                                UnescapeString( via->GetNetname() ),
+                                UnescapeString( originalNetname ),
                                 UnescapeString( updatedNetname ) );
 
                     m_reporter->Report( msg, RPT_SEVERITY_ACTION );
@@ -665,11 +667,13 @@ bool BOARD_NETLIST_UPDATER::updateCopperZoneNets( NETLIST& aNetlist )
 
                     if( netinfo )
                     {
+                        wxString originalNetname = via->GetNetname();
+
                         m_commit.Modify( via );
                         via->SetNet( netinfo );
 
                         msg.Printf( _( "Reconnected via from %s to %s." ),
-                                    UnescapeString( via->GetNetname() ),
+                                    UnescapeString( originalNetname ),
                                     UnescapeString( updatedNetname ) );
 
                         m_reporter->Report( msg, RPT_SEVERITY_ACTION );
@@ -719,17 +723,19 @@ bool BOARD_NETLIST_UPDATER::updateCopperZoneNets( NETLIST& aNetlist )
             {
                 if( m_isDryRun )
                 {
+                    wxString originalNetname = zone->GetNetname();
+
                     if( !zone->GetZoneName().IsEmpty() )
                     {
                         msg.Printf( _( "Reconnect copper zone '%s' from %s to %s." ),
                                     zone->GetZoneName(),
-                                    UnescapeString( zone->GetNetname() ),
+                                    UnescapeString( originalNetname ),
                                     UnescapeString( updatedNetname ) );
                     }
                     else
                     {
                         msg.Printf( _( "Reconnect copper zone from %s to %s." ),
-                                    UnescapeString( zone->GetNetname() ),
+                                    UnescapeString( originalNetname ),
                                     UnescapeString( updatedNetname ) );
                     }
 
@@ -744,6 +750,8 @@ bool BOARD_NETLIST_UPDATER::updateCopperZoneNets( NETLIST& aNetlist )
 
                     if( netinfo )
                     {
+                        wxString originalNetname = zone->GetNetname();
+
                         m_commit.Modify( zone );
                         zone->SetNet( netinfo );
 
@@ -751,13 +759,13 @@ bool BOARD_NETLIST_UPDATER::updateCopperZoneNets( NETLIST& aNetlist )
                         {
                             msg.Printf( _( "Reconnected copper zone '%s' from %s to %s." ),
                                         zone->GetZoneName(),
-                                        UnescapeString( zone->GetNetname() ),
+                                        UnescapeString( originalNetname ),
                                         UnescapeString( updatedNetname ) );
                         }
                         else
                         {
                             msg.Printf( _( "Reconnected copper zone from %s to %s." ),
-                                        UnescapeString( zone->GetNetname() ),
+                                        UnescapeString( originalNetname ),
                                         UnescapeString( updatedNetname ) );
                         }