From 74b1f603df8b2b77b11500c253a24eb760fc63fe Mon Sep 17 00:00:00 2001
From: Roberto Fernandez Bautista <roberto.fer.bau@gmail.com>
Date: Wed, 28 Jun 2023 23:29:43 +0200
Subject: [PATCH] Ensure symbols in subsheets are added to multi-unit map
 before re-annotating

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

(cherry picked from commit 6d3f512e155597024daa987aa177f16b5324f038)
---
 eeschema/annotate.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/eeschema/annotate.cpp b/eeschema/annotate.cpp
index 0c26af75f6..ef73f10a7a 100644
--- a/eeschema/annotate.cpp
+++ b/eeschema/annotate.cpp
@@ -276,12 +276,19 @@ void SCH_EDIT_FRAME::AnnotateSymbols( ANNOTATE_SCOPE_T  aAnnotateScope,
 
     case ANNOTATE_CURRENT_SHEET:
         currentSheet.GetMultiUnitSymbols( lockedSymbols );
+
+        if( aRecursive )
+            subSheets.GetMultiUnitSymbols( lockedSymbols );
+
         break;
 
     case ANNOTATE_SELECTION:
         for( SCH_SYMBOL* symbol : selectedSymbols )
             currentSheet.AppendMultiUnitSymbol( lockedSymbols, symbol );
 
+        if( aRecursive )
+            selectedSheets.GetMultiUnitSymbols( lockedSymbols );
+
         break;
     }