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

Fix crash editing footprint editor defaults 

Missing one level of GetParent()....use a dynamic_cast to sanity check it in debug

Fixes sentry crash KICAD-R4
This commit is contained in:
Marek Roszko 2023-03-22 18:39:08 -04:00
parent 8150deec32
commit d49562a7aa
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pcbnew/dialogs/panel_fp_editor_defaults.cpp
View File

@ -174,7 +174,8 @@ PANEL_FP_EDITOR_DEFAULTS::PANEL_FP_EDITOR_DEFAULTS( wxWindow* aParent,
UNITS_PROVIDER* aUnitsProvider ) : UNITS_PROVIDER* aUnitsProvider ) :
PANEL_FP_EDITOR_DEFAULTS_BASE( aParent ) PANEL_FP_EDITOR_DEFAULTS_BASE( aParent )
{ {
m_parent = static_cast<PAGED_DIALOG*>( aParent->GetParent() ); m_parent = dynamic_cast<PAGED_DIALOG*>( aParent->GetParent()->GetParent() );
wxASSERT_MSG( m_parent, wxS( "Incorrect parent window passed" ) );
m_textItemsGrid->SetDefaultRowSize( m_textItemsGrid->GetDefaultRowSize() + 4 ); m_textItemsGrid->SetDefaultRowSize( m_textItemsGrid->GetDefaultRowSize() + 4 );
@ -331,7 +332,9 @@ bool PANEL_FP_EDITOR_DEFAULTS::validateData()
int textSize = std::min( m_graphicsGrid->GetUnitValue( row, COL_TEXT_WIDTH ), int textSize = std::min( m_graphicsGrid->GetUnitValue( row, COL_TEXT_WIDTH ),
m_graphicsGrid->GetUnitValue( row, COL_TEXT_HEIGHT ) ); m_graphicsGrid->GetUnitValue( row, COL_TEXT_HEIGHT ) );
if( m_graphicsGrid->GetUnitValue( row, COL_TEXT_THICKNESS ) > textSize / 4 ) int thickness = m_graphicsGrid->GetUnitValue( row, COL_TEXT_THICKNESS );
if( thickness > textSize / 4 )
{ {
wxString msg = _( "Text will not be readable with a thickness greater than\n" wxString msg = _( "Text will not be readable with a thickness greater than\n"
"1/4 its width or height." ); "1/4 its width or height." );