From 07ebc4df14583cf6eefc93a143882922d1b71ad2 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Sat, 1 Dec 2018 13:42:51 -0500 Subject: [PATCH] Fix schematic append clear annotation bug. Clear the annotation of only the appended schematic and any sheets in it's hierarchy. Do not clear the annotation of the symbols in the target sheet. Fixes lp:1805695 https://bugs.launchpad.net/kicad/+bug/1805695 --- eeschema/files-io.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp index 405865c2f9..7cd6b0eaae 100644 --- a/eeschema/files-io.cpp +++ b/eeschema/files-io.cpp @@ -576,6 +576,8 @@ bool SCH_EDIT_FRAME::AppendSchematic() } } + newScreens.ClearAnnotation(); + // Check for duplicate sheet names in the current page. wxArrayString duplicateSheetNames; SCH_TYPE_COLLECTOR sheets; @@ -622,7 +624,7 @@ bool SCH_EDIT_FRAME::AppendSchematic() // Clear all annotation in the imported schematic to prevent clashes with existing annotation. // Must be done after updating the symbol links as we need to know about multi-unit parts. - screens.ClearAnnotation(); + // screens.ClearAnnotation(); screens.TestDanglingEnds();