From 7cce283feabe4004c606d44a67f3f10f1f5c7ecd Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sun, 22 Jul 2018 11:16:40 +0100
Subject: [PATCH] Fix diff pair custom values.

Fixes: lp:1782971
* https://bugs.launchpad.net/kicad/+bug/1782971

(cherry picked from commit 53f35a3)
---
 pcbnew/dialogs/dialog_pns_diff_pair_dimensions.cpp | 6 +++---
 pcbnew/router/router_tool.cpp                      | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pcbnew/dialogs/dialog_pns_diff_pair_dimensions.cpp b/pcbnew/dialogs/dialog_pns_diff_pair_dimensions.cpp
index 6f89a2b674..b7f0be397a 100644
--- a/pcbnew/dialogs/dialog_pns_diff_pair_dimensions.cpp
+++ b/pcbnew/dialogs/dialog_pns_diff_pair_dimensions.cpp
@@ -31,9 +31,9 @@
 DIALOG_PNS_DIFF_PAIR_DIMENSIONS::DIALOG_PNS_DIFF_PAIR_DIMENSIONS( EDA_DRAW_FRAME* aParent,
                                                                   PNS::SIZES_SETTINGS& aSizes ) :
     DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE( aParent ),
-    m_traceWidth( aParent, m_traceWidthLabel, m_traceWidthText, m_traceWidthUnit ),
-    m_traceGap( aParent, m_traceGapLabel, m_traceGapText, m_traceGapUnit ),
-    m_viaGap( aParent, m_viaGapLabel, m_viaGapText, m_viaGapUnit ),
+    m_traceWidth( aParent, m_traceWidthLabel, m_traceWidthText, m_traceWidthUnit, true ),
+    m_traceGap( aParent, m_traceGapLabel, m_traceGapText, m_traceGapUnit, true ),
+    m_viaGap( aParent, m_viaGapLabel, m_viaGapText, m_viaGapUnit, true ),
     m_sizes( aSizes )
 {
     Layout();
diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp
index 897b497796..9cc2a51b30 100644
--- a/pcbnew/router/router_tool.cpp
+++ b/pcbnew/router/router_tool.cpp
@@ -853,6 +853,11 @@ int ROUTER_TOOL::DpDimensionsDialog( const TOOL_EVENT& aEvent )
     {
         m_router->UpdateSizes( sizes );
         m_savedSizes = sizes;
+
+        BOARD_DESIGN_SETTINGS& bds = frame()->GetBoard()->GetDesignSettings();
+        bds.SetCustomDiffPairWidth( sizes.DiffPairWidth() );
+        bds.SetCustomDiffPairGap( sizes.DiffPairGap() );
+        bds.SetCustomDiffPairViaGap( sizes.DiffPairViaGap() );
     }
 
     return 0;