Fix InputConfigDiag crash on Windows. (GCode issue 7384)
This commit is contained in:
parent
0e0238eccf
commit
7ecc32f87f
|
@ -512,8 +512,8 @@ void ControlDialog::DetectControl(wxCommandEvent& event)
|
||||||
{
|
{
|
||||||
btn->SetLabel(_("[ waiting ]"));
|
btn->SetLabel(_("[ waiting ]"));
|
||||||
|
|
||||||
// apparently, this makes the "waiting" text work on Linux
|
// This makes the "waiting" text work on Linux. true (only if needed) prevents crash on Windows
|
||||||
wxTheApp->Yield();
|
wxTheApp->Yield(true);
|
||||||
|
|
||||||
std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
|
std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
|
||||||
Device::Control* const ctrl = control_reference->Detect(DETECT_WAIT_TIME, dev);
|
Device::Control* const ctrl = control_reference->Detect(DETECT_WAIT_TIME, dev);
|
||||||
|
@ -536,8 +536,8 @@ void GamepadPage::DetectControl(wxCommandEvent& event)
|
||||||
{
|
{
|
||||||
btn->SetLabel(_("[ waiting ]"));
|
btn->SetLabel(_("[ waiting ]"));
|
||||||
|
|
||||||
// apparently, this makes the "waiting" text work on Linux
|
// This makes the "waiting" text work on Linux. true (only if needed) prevents crash on Windows
|
||||||
wxTheApp->Yield();
|
wxTheApp->Yield(true);
|
||||||
|
|
||||||
std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
|
std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
|
||||||
Device::Control* const ctrl = btn->control_reference->Detect(DETECT_WAIT_TIME, dev);
|
Device::Control* const ctrl = btn->control_reference->Detect(DETECT_WAIT_TIME, dev);
|
||||||
|
|
Loading…
Reference in New Issue