diff options
| author | bunnei <bunneidev@gmail.com> | 2015-02-09 22:17:20 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-02-09 22:17:20 -0500 |
| commit | 848795f3834c30695208e86c5bbebf6c71a57d96 (patch) | |
| tree | 2cc5b3092cf41215bac17c6ddaf3bdec985b7adb /src/core/hle/kernel/mutex.h | |
| parent | 837439e7d57833973e6f3bdd04ce597aaaa9fd45 (diff) | |
| parent | 1b0bf00cbcadfc4cca0a3d16efac8b85a4bd71e5 (diff) | |
Merge pull request #551 from bunnei/mutex-fixes
Mutex/synch fixes
Diffstat (limited to 'src/core/hle/kernel/mutex.h')
| -rw-r--r-- | src/core/hle/kernel/mutex.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/hle/kernel/mutex.h b/src/core/hle/kernel/mutex.h index 548403614..d6d5328be 100644 --- a/src/core/hle/kernel/mutex.h +++ b/src/core/hle/kernel/mutex.h @@ -30,8 +30,7 @@ public: static const HandleType HANDLE_TYPE = HandleType::Mutex; HandleType GetHandleType() const override { return HANDLE_TYPE; } - bool initial_locked; ///< Initial lock state when mutex was created - bool locked; ///< Current locked state + int lock_count; ///< Number of times the mutex has been acquired std::string name; ///< Name of mutex (optional) SharedPtr<Thread> holding_thread; ///< Thread that has acquired the mutex |