From a365afde3c20d74e706ff40adac7f589b181a17e Mon Sep 17 00:00:00 2001
From: Seth Hillbrand <seth@kipro-pcb.com>
Date: Sat, 1 Jan 2022 16:52:17 -0800
Subject: [PATCH] Ensure merged line gets selected if either parent is

We were only checking for the selection of a single line that gets
merged.  This prevents the merged line from being highlighted but not
selected after merging

Fixes https://gitlab.com/kicad/code/kicad/issues/10202

(cherry picked from commit addc5574b483f00a956d5797a83b90bd754637da)
---
 eeschema/bus-wire-junction.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eeschema/bus-wire-junction.cpp b/eeschema/bus-wire-junction.cpp
index 6c8ce6b7cb..a14c890397 100644
--- a/eeschema/bus-wire-junction.cpp
+++ b/eeschema/bus-wire-junction.cpp
@@ -268,7 +268,7 @@ bool SCH_EDIT_FRAME::SchematicCleanUp( SCH_SCREEN* aScreen )
 
                     AddToScreen( mergedLine, aScreen );
 
-                    if( firstLine->IsSelected() )
+                    if( firstLine->IsSelected() || secondLine->IsSelected() )
                         selectionTool->AddItemToSel( mergedLine, true /*quiet mode*/ );
 
                     break;