diff options
| author | skidau <skidau@gmail.com> | 2015-03-12 23:41:30 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2015-03-12 23:41:30 +1100 |
| commit | c76008b4b9eccf0c8fc04a0dada0313fc6d8c3f6 (patch) | |
| tree | 9a0fd70a27c71defb8eaba9ab0aa27ade8ee0bae /Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp | |
| parent | 2c6eaf9c764df310309a39f370e7919a3df974e2 (diff) | |
Removed the controller update lock as it is no longer needed.
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) |