summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorGravatar bunnei2014-07-21 18:50:49 -0400
committerGravatar bunnei2014-08-05 20:14:51 -0400
commit7a1f813be15aca815893139b1de125f4e3f47d84 (patch)
tree5ca441fb8d06be369f801051c9100eb6f97981c3 /src/core/hle/kernel
parentQt: Removed unnecessary HW::Update. (diff)
downloadyuzu-7a1f813be15aca815893139b1de125f4e3f47d84.tar.gz
yuzu-7a1f813be15aca815893139b1de125f4e3f47d84.tar.xz
yuzu-7a1f813be15aca815893139b1de125f4e3f47d84.zip
Kernel: Updated Event and Mutex to specify handle that they are blocking for.
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/event.cpp2
-rw-r--r--src/core/hle/kernel/mutex.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp
index 127c0cfc6..1e417e09c 100644
--- a/src/core/hle/kernel/event.cpp
+++ b/src/core/hle/kernel/event.cpp
@@ -42,7 +42,7 @@ public:
42 if (std::find(waiting_threads.begin(), waiting_threads.end(), thread) == waiting_threads.end()) { 42 if (std::find(waiting_threads.begin(), waiting_threads.end(), thread) == waiting_threads.end()) {
43 waiting_threads.push_back(thread); 43 waiting_threads.push_back(thread);
44 } 44 }
45 Kernel::WaitCurrentThread(WAITTYPE_EVENT); 45 Kernel::WaitCurrentThread(WAITTYPE_EVENT, GetHandle());
46 } 46 }
47 if (reset_type != RESETTYPE_STICKY && !permanent_locked) { 47 if (reset_type != RESETTYPE_STICKY && !permanent_locked) {
48 locked = true; 48 locked = true;
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp
index 1ccf1eb73..055f503f9 100644
--- a/src/core/hle/kernel/mutex.cpp
+++ b/src/core/hle/kernel/mutex.cpp
@@ -48,7 +48,7 @@ public:
48 *wait = locked; 48 *wait = locked;
49 49
50 if (locked) { 50 if (locked) {
51 Kernel::WaitCurrentThread(WAITTYPE_MUTEX); 51 Kernel::WaitCurrentThread(WAITTYPE_MUTEX, GetHandle());
52 } 52 }
53 53
54 return 0; 54 return 0;