From 2c1b6e42e0d9ba6ae770bb42ac28139cc26eb171 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sun, 1 Nov 2020 00:09:48 +0000 Subject: [PATCH] Repair ARC copy constructor. Fixes https://gitlab.com/kicad/code/kicad/issues/6176 --- pcbnew/router/pns_arc.cpp | 4 ++++ pcbnew/router/pns_arc.h | 13 ++++++++----- pcbnew/router/pns_segment.h | 3 ++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pcbnew/router/pns_arc.cpp b/pcbnew/router/pns_arc.cpp index 9ec46eeb9e..c9b30b939c 100644 --- a/pcbnew/router/pns_arc.cpp +++ b/pcbnew/router/pns_arc.cpp @@ -39,6 +39,10 @@ ARC* ARC::Clone() const { ARC* a = new ARC( m_arc, m_net ); + a->m_layers = m_layers; + a->m_marker = m_marker; + a->m_rank = m_rank; + return a; } diff --git a/pcbnew/router/pns_arc.h b/pcbnew/router/pns_arc.h index 2323f40ad4..57b9183a66 100644 --- a/pcbnew/router/pns_arc.h +++ b/pcbnew/router/pns_arc.h @@ -37,17 +37,20 @@ class NODE; class ARC : public LINKED_ITEM { public: - ARC() : LINKED_ITEM( ARC_T ) + ARC() : + LINKED_ITEM( ARC_T ) {} - ARC( const SHAPE_ARC& aArc, int aNet ) : LINKED_ITEM( ARC_T ), m_arc( aArc ) + ARC( const SHAPE_ARC& aArc, int aNet ) : + LINKED_ITEM( ARC_T ), + m_arc( aArc ) { m_net = aNet; } - ARC( const ARC& aParentArc, const SHAPE_ARC& aArc ) - : LINKED_ITEM( ARC_T ), - m_arc( aArc ) + ARC( const ARC& aParentArc, const SHAPE_ARC& aArc ) : + LINKED_ITEM( ARC_T ), + m_arc( aArc ) { m_net = aParentArc.Net(); m_layers = aParentArc.Layers(); diff --git a/pcbnew/router/pns_segment.h b/pcbnew/router/pns_segment.h index e8c21d92ca..e5c983e96f 100644 --- a/pcbnew/router/pns_segment.h +++ b/pcbnew/router/pns_segment.h @@ -43,7 +43,8 @@ public: {} SEGMENT( const SEG& aSeg, int aNet ) : - LINKED_ITEM( SEGMENT_T ), m_seg( aSeg, 0 ) + LINKED_ITEM( SEGMENT_T ), + m_seg( aSeg, 0 ) { m_net = aNet; }