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

Only initialize VALIDATOR if we're using it. 

It appears to get called by the wxWidgets framework sometimes even
when invisible/unenabled.

Fixes https://gitlab.com/kicad/code/kicad/issues/8483
This commit is contained in:
Jeff Young 2021-05-26 12:38:23 +01:00
parent c692b04eb9
commit 3d0fe8e2c6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
eeschema/dialogs/dialog_edit_one_field.cpp
View File

@ -81,9 +81,7 @@ DIALOG_EDIT_ONE_FIELD::~DIALOG_EDIT_ONE_FIELD()
void DIALOG_EDIT_ONE_FIELD::init() void DIALOG_EDIT_ONE_FIELD::init()
{ {
SCH_BASE_FRAME* parent = GetParent(); SCH_BASE_FRAME* parent = GetParent();
bool isSymbolEditor = parent->IsType( FRAME_SCH_SYMBOL_EDITOR ); bool isSymbolEditor = parent && parent->IsType( FRAME_SCH_SYMBOL_EDITOR );
m_TextCtrl->SetValidator( SCH_FIELD_VALIDATOR( isSymbolEditor, m_fieldId, &m_text ) );
// Disable options for graphic text editing which are not needed for fields. // Disable options for graphic text editing which are not needed for fields.
m_CommonConvert->Show( false ); m_CommonConvert->Show( false );
@ -100,13 +98,16 @@ void DIALOG_EDIT_ONE_FIELD::init()
if( use_validator ) if( use_validator )
{ {
m_StyledTextCtrl->Show( false ); m_TextCtrl->SetValidator( SCH_FIELD_VALIDATOR( isSymbolEditor, m_fieldId, &m_text ) );
SetInitialFocus( m_TextCtrl ); SetInitialFocus( m_TextCtrl );
m_StyledTextCtrl->Show( false );
} }
else else
{ {
m_TextCtrl->Show( false );
SetInitialFocus( m_StyledTextCtrl ); SetInitialFocus( m_StyledTextCtrl );
m_TextCtrl->Show( false );
} }
// Show the footprint selection dialog if this is the footprint field. // Show the footprint selection dialog if this is the footprint field.