From c76008b4b9eccf0c8fc04a0dada0313fc6d8c3f6 Mon Sep 17 00:00:00 2001 From: skidau Date: Thu, 12 Mar 2015 23:41:30 +1100 Subject: Removed the controller update lock as it is no longer needed. --- Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp') 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 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) -- cgit v1.2.3