diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2014-06-19 19:58:55 -0500 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2014-06-19 19:58:55 -0500 |
| commit | 7ecc32f87f6b0e7fca2e9fdae90f83f2f66d9aca (patch) | |
| tree | ba6c3c04d034bf903b071858cbe47b7eaf1e6f6a /Source/Core | |
| parent | 0e0238eccfa314a24d11aa36c727c54e1ca90a2a (diff) | |
Fix InputConfigDiag crash on Windows. (GCode issue 7384)
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/InputConfigDiag.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/InputConfigDiag.cpp b/Source/Core/DolphinWX/InputConfigDiag.cpp index 8c249ea690..2990fdba6b 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.cpp +++ b/Source/Core/DolphinWX/InputConfigDiag.cpp @@ -512,8 +512,8 @@ void ControlDialog::DetectControl(wxCommandEvent& event) { btn->SetLabel(_("[ waiting ]")); - // apparently, this makes the "waiting" text work on Linux - wxTheApp->Yield(); + // This makes the "waiting" text work on Linux. true (only if needed) prevents crash on Windows + wxTheApp->Yield(true); std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock); Device::Control* const ctrl = control_reference->Detect(DETECT_WAIT_TIME, dev); @@ -536,8 +536,8 @@ void GamepadPage::DetectControl(wxCommandEvent& event) { btn->SetLabel(_("[ waiting ]")); - // apparently, this makes the "waiting" text work on Linux - wxTheApp->Yield(); + // This makes the "waiting" text work on Linux. true (only if needed) prevents crash on Windows + wxTheApp->Yield(true); std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock); Device::Control* const ctrl = btn->control_reference->Detect(DETECT_WAIT_TIME, dev); |