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/InputCommon/ControllerInterface | |
| parent | 2c6eaf9c764df310309a39f370e7919a3df974e2 (diff) | |
Removed the controller update lock as it is no longer needed.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.h | 2 |
2 files changed, 0 insertions, 4 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; |