From 3cc87b4597a221717f46071e61cc1aff89145346 Mon Sep 17 00:00:00 2001
From: Seth Hillbrand <hillbrand@ucdavis.edu>
Date: Sat, 20 Oct 2018 07:57:54 -0700
Subject: [PATCH] PNS: Ensure we don't miss items
Higher candidate levels could override better matches if the layers did
not overlap.
---
pcbnew/router/pns_tool_base.cpp | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/pcbnew/router/pns_tool_base.cpp b/pcbnew/router/pns_tool_base.cpp
index 18a222ea2a..169a6ffcf4 100644
--- a/pcbnew/router/pns_tool_base.cpp
+++ b/pcbnew/router/pns_tool_base.cpp
@@ -189,16 +189,13 @@ ITEM* TOOL_BASE::pickSingleItem( const VECTOR2I& aWhere, int aNet, int aLayer, b
if( item && !item->Layers().Overlaps( tl ) )
item = NULL;
- if( item )
+ if( item && ( aLayer < 0 || item->Layers().Overlaps( aLayer ) ) )
{
rv = item;
break;
}
}
- if( rv && aLayer >= 0 && !rv->Layers().Overlaps( aLayer ) )
- rv = NULL;
-
if( rv )
{
wxLogTrace( "PNS", "%s, layer : %d, tl: %d", rv->KindStr().c_str(), rv->Layers().Start(), tl );