From 04e24282a832ced411430bf19c17813d53af7549 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sat, 1 Apr 2017 11:48:02 +0200 Subject: [PATCH] Fix bug: Render->Grid(Color) doesn't saved between kicad sessions. Fixes: lp:1670084 https://bugs.launchpad.net/kicad/+bug/1670084 --- common/draw_frame.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/common/draw_frame.cpp b/common/draw_frame.cpp index f1ed3aa397..826a717015 100644 --- a/common/draw_frame.cpp +++ b/common/draw_frame.cpp @@ -693,9 +693,12 @@ void EDA_DRAW_FRAME::LoadSettings( wxConfigBase* aCfg ) if( aCfg->Read( baseCfgName + ShowGridEntryKeyword, &btmp ) ) SetGridVisibility( btmp ); - int itmp; - if( aCfg->Read( baseCfgName + GridColorEntryKeyword, &itmp ) ) - SetGridColor( ColorFromInt( itmp ) ); + // Read grid color: + COLOR4D wtmp = COLOR4D::UNSPECIFIED; + + if( wtmp.SetFromWxString( aCfg->Read( + baseCfgName + GridColorEntryKeyword, wxT( "NONE" ) ) ) ) + SetGridColor( wtmp ); aCfg->Read( baseCfgName + LastGridSizeIdKeyword, &m_LastGridSizeId, 0L );