haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't try to set an active layer that doesn't exist 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/5273
This commit is contained in:
Jon Evans 2020-08-19 17:17:52 -04:00
parent 631b5a9340
commit 9437afef0b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pcbnew/widgets/appearance_controls.cpp
View File

@ -1653,10 +1653,17 @@ void APPEARANCE_CONTROLS::doApplyLayerPreset( const LAYER_PRESET& aPreset )
// If the preset doesn't have an explicit active layer to restore, we can at least
// force the active layer to be something in the preset's layer set
PCB_LAYER_ID activeLayer = UNSELECTED_LAYER;
if( aPreset.activeLayer != UNSELECTED_LAYER )
m_frame->SetActiveLayer( aPreset.activeLayer );
activeLayer = aPreset.activeLayer;
else if( aPreset.layers.any() && !aPreset.layers.test( m_frame->GetActiveLayer() ) )
m_frame->SetActiveLayer( *aPreset.layers.Seq().begin() );
activeLayer = *aPreset.layers.Seq().begin();
LSET boardLayers = board->GetLayerSet();
if( activeLayer != UNSELECTED_LAYER && boardLayers.Contains( activeLayer ) )
m_frame->SetActiveLayer( activeLayer );
m_frame->GetCanvas()->SyncLayersVisibility( board );
m_frame->GetCanvas()->Refresh();