From 1b0bf00cbcadfc4cca0a3d16efac8b85a4bd71e5 Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 9 Feb 2015 22:06:09 -0500 Subject: Mutex: Locks should be recursive. --- src/core/hle/kernel/mutex.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/core/hle/kernel/mutex.h') diff --git a/src/core/hle/kernel/mutex.h b/src/core/hle/kernel/mutex.h index 54840361..d6d5328b 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 holding_thread; ///< Thread that has acquired the mutex -- cgit v1.2.3