diff options
Diffstat (limited to 'Source/Plugins/InputPluginCommon/Src/ConfigDiag.cpp')
| -rw-r--r-- | Source/Plugins/InputPluginCommon/Src/ConfigDiag.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/Plugins/InputPluginCommon/Src/ConfigDiag.cpp b/Source/Plugins/InputPluginCommon/Src/ConfigDiag.cpp index 6f99574bc2..c6ca3e920c 100644 --- a/Source/Plugins/InputPluginCommon/Src/ConfigDiag.cpp +++ b/Source/Plugins/InputPluginCommon/Src/ConfigDiag.cpp @@ -420,12 +420,16 @@ void ControlDialog::SelectControl( wxCommandEvent& event ) final_label += names[ sels[i] ] + wxT('|'); } - control_chooser->textctrl->SetValue( final_label ); +#ifdef __linux__ + if (!((wxWindow*)this)->IsBeingDeleted()) +#endif + control_chooser->textctrl->SetValue( final_label ); +#ifndef __linux__ // This causes the application to hang in linux // kinda dumb wxCommandEvent nullevent; ((GamepadPage*)m_parent)->SetControl( nullevent ); - +#endif } ControlChooser::ControlChooser( wxWindow* const parent, ControllerInterface::ControlReference* const ref, wxWindow* const eventsink ) |