From 24846d3f4477b3446154777a823ea86f80ec9f94 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Tue, 19 Dec 2023 16:47:44 +0000
Subject: [PATCH] Repair earlier fix for VVIAs.

---
 pcbnew/router/pns_joint.h  | 10 +++++-----
 pcbnew/router/pns_node.cpp |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pcbnew/router/pns_joint.h b/pcbnew/router/pns_joint.h
index fd864b35e5..a4afaa9e1a 100644
--- a/pcbnew/router/pns_joint.h
+++ b/pcbnew/router/pns_joint.h
@@ -126,17 +126,17 @@ public:
                 if( item->IsVirtual() )
                     continue;
 
-                if( item->Kind() == VIA_T )
-                {
-                    return false;
-                }
-                else if( item->Kind() == SEGMENT_T || item->Kind() == ARC_T )
+                if( item->Kind() == SEGMENT_T || item->Kind() == ARC_T )
                 {
                     if( !seg1 )
                         seg1 = static_cast<const LINKED_ITEM*>( item );
                     else
                         seg2 = static_cast<const LINKED_ITEM*>( item );
                 }
+                else
+                {
+                    return false;
+                }
             }
 
             wxCHECK( seg1 && seg2, false );
diff --git a/pcbnew/router/pns_node.cpp b/pcbnew/router/pns_node.cpp
index d8405f2fe3..10af93f743 100644
--- a/pcbnew/router/pns_node.cpp
+++ b/pcbnew/router/pns_node.cpp
@@ -1085,7 +1085,7 @@ const LINE NODE::AssembleLine( LINKED_ITEM* aSeg, int* aOriginSegmentIndex,
     if( aOriginSegmentIndex && *aOriginSegmentIndex >= pl.SegmentCount() )
         *aOriginSegmentIndex = pl.SegmentCount() - 1;
 
-    assert( pl.SegmentCount() != 0 );
+    wxASSERT_MSG( pl.SegmentCount() != 0, "assembled line should never be empty" );
 
     return pl;
 }