summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Core/InputCommon')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ControllerInterface.h2
-rw-r--r--Source/Core/InputCommon/InputConfig.h2
3 files changed, 0 insertions, 6 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
index 1330cb1e0a..00a9579daf 100644
--- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
@@ -134,8 +134,6 @@ void ControllerInterface::Shutdown()
//
void ControllerInterface::UpdateInput()
{
- std::unique_lock<std::recursive_mutex> lk(update_lock, std::defer_lock);
-
for (ciface::Core::Device* d : m_devices)
d->UpdateInput();
}
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
index 9ab8427ad2..e69907337f 100644
--- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
@@ -122,8 +122,6 @@ public:
void UpdateReference(ControlReference* control, const ciface::Core::DeviceQualifier& default_device) const;
void UpdateInput();
- std::recursive_mutex update_lock;
-
private:
bool m_is_init;
void* m_hwnd;
diff --git a/Source/Core/InputCommon/InputConfig.h b/Source/Core/InputCommon/InputConfig.h
index a234cdf167..c339cbb243 100644
--- a/Source/Core/InputCommon/InputConfig.h
+++ b/Source/Core/InputCommon/InputConfig.h
@@ -26,8 +26,6 @@ public:
std::vector<ControllerEmu*> controllers;
- std::recursive_mutex controls_lock; // for changing any control references
-
const char* const ini_name;
const char* const gui_name;
const char* const profile_name;