From 17b0bdc9fe0d3405709611d86fd8fbe880600d20 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Thu, 14 Sep 2023 23:54:04 +0100
Subject: [PATCH] Check value-follows-name case in symbol Save As.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/15647

(cherry picked from commit 849a4656c85cfedceff3440d08ac2eb486716293)
---
 eeschema/symbol_editor/symbol_editor.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eeschema/symbol_editor/symbol_editor.cpp b/eeschema/symbol_editor/symbol_editor.cpp
index eac4ae58c1..24af05a968 100644
--- a/eeschema/symbol_editor/symbol_editor.cpp
+++ b/eeschema/symbol_editor/symbol_editor.cpp
@@ -605,6 +605,7 @@ void SYMBOL_EDIT_FRAME::saveSymbolAs()
         LIB_ID   old_lib_id = symbol->GetLibId();
         wxString symbolName = old_lib_id.GetLibItemName();
         wxString libraryName = old_lib_id.GetLibNickname();
+        bool     valueFollowsName = symbol->GetValueField().GetText() == symbolName;
         bool     done = false;
 
         std::unique_ptr<EDA_LIST_DIALOG> dlg;
@@ -677,6 +678,9 @@ void SYMBOL_EDIT_FRAME::saveSymbolAs()
         LIB_SYMBOL new_symbol( *symbol );
         new_symbol.SetName( symbolName );
 
+        if( valueFollowsName )
+            new_symbol.GetValueField().SetText( symbolName );
+
         m_libMgr->UpdateSymbol( &new_symbol, libraryName );
         SyncLibraries( false );
         m_treePane->GetLibTree()->SelectLibId( LIB_ID( libraryName, new_symbol.GetName() ) );