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

Fix assertion when rendering layer editor

This commit is contained in:
Jon Evans 2022-08-21 22:31:06 -04:00
parent 940a15c547
commit 284917b999
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/pg_properties.cpp
View File

@ -303,6 +303,10 @@ void PGPROPERTY_COLORENUM::OnCustomPaint( wxDC& aDC, const wxRect& aRect,
if( index < 0 ) if( index < 0 )
index = GetIndex(); index = GetIndex();
// GetIndex can return -1 when the control hasn't been set up yet
if( index < 0 || index >= static_cast<int>( GetChoices().GetCount() ) )
return;
wxString layer = GetChoices().GetLabel( index ); wxString layer = GetChoices().GetLabel( index );
wxColour color = GetColor( layer ); wxColour color = GetColor( layer );
@ -312,4 +316,6 @@ void PGPROPERTY_COLORENUM::OnCustomPaint( wxDC& aDC, const wxRect& aRect,
aDC.SetPen( *wxTRANSPARENT_PEN ); aDC.SetPen( *wxTRANSPARENT_PEN );
aDC.SetBrush( wxBrush( color ) ); aDC.SetBrush( wxBrush( color ) );
aDC.DrawRectangle( aRect ); aDC.DrawRectangle( aRect );
aPaintData.m_drawnWidth = aRect.width;
} }