diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2011-03-07 00:16:38 +0000 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2011-03-07 00:16:38 +0000 |
| commit | 5f87642f2339d2e3574e9b9e3ec386462f2634c7 (patch) | |
| tree | 1bfcb9d94cc1e9e3f312518004d8d316ce3a378e /Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp | |
| parent | 3151618cb38db1205cfa1043784b33ed29d8e3ef (diff) | |
problem: TryAcquireSRWLockExclusive requires Windows 7 :/. solution kinda: use std::recursive_mutex (CriticalSection on windows) where try_lock is used. Dolphin should work on Vista x64 again.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7313 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp index 16c633db78..77203e7ec0 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp @@ -118,7 +118,7 @@ void ControllerInterface::SetHwnd( void* const hwnd ) // bool ControllerInterface::UpdateInput(const bool force) { - std::unique_lock<std::mutex> lk(update_lock, std::defer_lock); + std::unique_lock<std::recursive_mutex> lk(update_lock, std::defer_lock); if (force) lk.lock(); @@ -149,7 +149,7 @@ bool ControllerInterface::UpdateInput(const bool force) // bool ControllerInterface::UpdateOutput(const bool force) { - std::unique_lock<std::mutex> lk(update_lock, std::defer_lock); + std::unique_lock<std::recursive_mutex> lk(update_lock, std::defer_lock); if (force) lk.lock(); |