ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #514 from jordan-woyak/input-diag-win-crash 

Fix InputConfigDiag crash on Windows. (GCode issue 7384)
This commit is contained in:
Matthew Parlane 2014-06-20 13:38:57 +12:00
parent d62ae92b8f 7ecc32f87f
commit 91502b4fc8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinWX/InputConfigDiag.cpp
View File

@ -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);