From 7ecc32f87f6b0e7fca2e9fdae90f83f2f66d9aca Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 19 Jun 2014 19:58:55 -0500 Subject: [PATCH] Fix InputConfigDiag crash on Windows. (GCode issue 7384) --- Source/Core/DolphinWX/InputConfigDiag.cpp | 8 ++++---- 1 file 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 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 lk(m_plugin.controls_lock); Device::Control* const ctrl = btn->control_reference->Detect(DETECT_WAIT_TIME, dev);