From 1558e63c0ecd6ee53b42d15b0bfb76a026941e99 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Tue, 18 Aug 2020 16:51:45 +0100
Subject: [PATCH] Make local overrides higher priority than netclass widths.

Fixes https://gitlab.com/kicad/code/kicad/issues/5249
---
 eeschema/sch_line.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eeschema/sch_line.cpp b/eeschema/sch_line.cpp
index 5567c32fcb..eca8a6030f 100644
--- a/eeschema/sch_line.cpp
+++ b/eeschema/sch_line.cpp
@@ -283,24 +283,24 @@ int SCH_LINE::GetPenWidth() const
         return DEFAULT_LINE_THICKNESS;
 
     case LAYER_WIRE:
-        if( netclass )
-            return netclass->GetWireWidth();
-
         if( m_stroke.GetWidth() > 0 )
             return m_stroke.GetWidth();
 
+        if( netclass )
+            return netclass->GetWireWidth();
+
         if( Schematic() )
             return Schematic()->Settings().m_DefaultWireThickness;
 
         return DEFAULT_WIRE_THICKNESS;
 
     case LAYER_BUS:
-        if( netclass )
-            return netclass->GetBusWidth();
-
         if( m_stroke.GetWidth() > 0 )
             return m_stroke.GetWidth();
 
+        if( netclass )
+            return netclass->GetBusWidth();
+
         if( Schematic() )
             return Schematic()->Settings().m_DefaultBusThickness;