diff options
| author | JosJuice <josjuice@gmail.com> | 2017-07-22 12:42:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-22 12:42:55 +0200 |
| commit | 57affaff22c1beeb08b76d998d72fb6f44376a47 (patch) | |
| tree | 8d9e11ce3a2732b37c5c1bd24e13572a39e045df /Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp | |
| parent | 2f0bec93cb3eb02f159461f13557bde4bd2771bb (diff) | |
| parent | 5729ac0fc685d42035dfa1c850672822a247851c (diff) | |
Merge pull request #5803 from leoetlino/pause-and-lock
Replace balanced Core::PauseAndLock calls with RunAsCPUThread
Diffstat (limited to 'Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp b/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp index 9cf3110e09..b5a862461d 100644 --- a/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp +++ b/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp @@ -71,12 +71,12 @@ void GCAdapterConfigDiag::ScheduleAdapterUpdate() void GCAdapterConfigDiag::OnUpdateAdapter(wxCommandEvent& WXUNUSED(event)) { - bool unpause = Core::PauseAndLock(true); - if (GCAdapter::IsDetected()) - m_adapter_status->SetLabelText(_("Adapter Detected")); - else - m_adapter_status->SetLabelText(_("Adapter Not Detected")); - Core::PauseAndLock(false, unpause); + Core::RunAsCPUThread([this] { + if (GCAdapter::IsDetected()) + m_adapter_status->SetLabelText(_("Adapter Detected")); + else + m_adapter_status->SetLabelText(_("Adapter Not Detected")); + }); } void GCAdapterConfigDiag::OnAdapterRumble(wxCommandEvent& event) |