Ensure symbols in subsheets are added to multi-unit map before re-annotating

Fixes https://gitlab.com/kicad/code/kicad/-/issues/14918
2 years ago · 6d3f512e15
1 changed files with 7 additions and 0 deletions
--- a/eeschema/annotate.cpp
+++ b/eeschema/annotate.cpp
@ -272,12 +272,19 @@ void SCH_EDIT_FRAME::AnnotateSymbols( SCH_COMMIT* aCommit, ANNOTATE_SCOPE_T  aAn

    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;
    }