From b4a3f4bb41fdb7c058477cc05eb5394958d17a94 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sun, 8 Sep 2019 23:08:15 +0100
Subject: [PATCH] Sync GAL grid with layer visibility on doc-open.

Fixes: lp:1843169
* https://bugs.launchpad.net/kicad/+bug/1843169
---
 pcbnew/pcb_edit_frame.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp
index f8aeeddf23..cf348ecbf6 100644
--- a/pcbnew/pcb_edit_frame.cpp
+++ b/pcbnew/pcb_edit_frame.cpp
@@ -155,8 +155,7 @@ BEGIN_EVENT_TABLE( PCB_EDIT_FRAME, PCB_BASE_FRAME )
 #endif
 
     // Tracks and vias sizes general options
-    EVT_MENU_RANGE( ID_POPUP_PCB_SELECT_WIDTH_START_RANGE,
-                    ID_POPUP_PCB_SELECT_WIDTH_END_RANGE,
+    EVT_MENU_RANGE( ID_POPUP_PCB_SELECT_WIDTH_START_RANGE, ID_POPUP_PCB_SELECT_WIDTH_END_RANGE,
                     PCB_EDIT_FRAME::Tracks_and_Vias_Size_Event )
 
     // User interface update event handlers.
@@ -307,7 +306,6 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
     InitExitKey();
 
     GetCanvas()->SwitchBackend( m_canvasType );
-    GetCanvas()->GetGAL()->SetGridSize( VECTOR2D( GetScreen()->GetGridSize() ) );
     GetCanvas()->GetView()->SetScale( GetZoomLevelCoeff() / GetScreen()->GetZoom() );
     ActivateGalCanvas();
 
@@ -529,6 +527,8 @@ void PCB_EDIT_FRAME::ActivateGalCanvas()
     PCB_BASE_EDIT_FRAME::ActivateGalCanvas();
     COLORS_DESIGN_SETTINGS& cds = Settings().Colors();
 
+    GetCanvas()->GetGAL()->SetGridVisibility( IsGridVisible() );
+    GetCanvas()->GetGAL()->SetGridSize( VECTOR2D( GetScreen()->GetGridSize() ) );
     GetCanvas()->GetGAL()->SetGridColor( cds.GetLayerColor( LAYER_GRID ) );
     GetCanvas()->GetView()->GetPainter()->GetSettings()->ImportLegacyColors( &cds );
     GetCanvas()->Refresh();