diff options
| author | Matthew Parlane <parlane@gmail.com> | 2015-04-21 11:13:30 +1200 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2015-04-21 11:13:30 +1200 |
| commit | a86f2fe2e799e7ea92149d86cf72aa9a46f69421 (patch) | |
| tree | fbe02a554550fb67faa0bcb67bc17e6e69117510 /Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp | |
| parent | 82bbada3524f6007b0ad82cf911962c028a728b3 (diff) | |
| parent | c76008b4b9eccf0c8fc04a0dada0313fc6d8c3f6 (diff) | |
Merge pull request #2199 from skidau/remove-controls-lock
Cleaned up the controller locking mechanism
Diffstat (limited to 'Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp b/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp index 3da0253581..e6beb5ef4a 100644 --- a/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp +++ b/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp @@ -453,11 +453,6 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event)) g_controller_interface.UpdateInput(); - // don't want game thread updating input when we are using it here - std::unique_lock<std::recursive_mutex> lk(g_controller_interface.update_lock, std::try_to_lock); - if (!lk.owns_lock()) - return; - GamepadPage* const current_page = (GamepadPage*)m_pad_notebook->GetPage(m_pad_notebook->GetSelection()); for (ControlGroupBox* g : current_page->control_groups) |