From a7eb61174440b0aa027d5b7c1c9d85d7d3ebd81d Mon Sep 17 00:00:00 2001
From: Jon Evans <jon@craftyjon.com>
Date: Wed, 23 Jun 2021 22:13:35 -0400
Subject: [PATCH] Fix leftover vias in shove mode

Fixes https://gitlab.com/kicad/code/kicad/-/issues/8597
---
 pcbnew/router/pns_line_placer.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pcbnew/router/pns_line_placer.cpp b/pcbnew/router/pns_line_placer.cpp
index f58c5bb4d9..1ec5bc551e 100644
--- a/pcbnew/router/pns_line_placer.cpp
+++ b/pcbnew/router/pns_line_placer.cpp
@@ -1083,6 +1083,10 @@ bool LINE_PLACER::SetLayer( int aLayer )
         m_currentLayer = aLayer;
         m_head.Line().Clear();
         m_tail.Line().Clear();
+        m_last_head.Line().Clear();
+        m_head.RemoveVia();
+        m_tail.RemoveVia();
+        m_last_head.RemoveVia();
         m_head.SetLayer( m_currentLayer );
         m_tail.SetLayer( m_currentLayer );
         Move( m_currentEnd, nullptr );