From b5d1e447821eb21158669e0ef1d24d630602f1fe Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow
Date: Fri, 29 Mar 2019 17:13:00 -0400
Subject: Add PrepareReschedule where required.

---
 src/core/hle/kernel/mutex.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/core/hle/kernel/mutex.cpp')

diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp
index 98e87313b..57f2d8bf3 100644
--- a/src/core/hle/kernel/mutex.cpp
+++ b/src/core/hle/kernel/mutex.cpp
@@ -140,6 +140,8 @@ ResultCode Mutex::Release(VAddr address) {
     thread->SetMutexWaitAddress(0);
     thread->SetWaitHandle(0);
 
+    Core::System::GetInstance().PrepareReschedule();
+
     return RESULT_SUCCESS;
 }
 } // namespace Kernel
-- 
cgit v1.2.3


From 82218c925af8bcbaa05ae9f39af2d2393de7681f Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow
Date: Wed, 19 Jun 2019 09:11:18 -0400
Subject: Kernel: Style and Corrections

---
 src/core/hle/kernel/mutex.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/core/hle/kernel/mutex.cpp')

diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp
index 57f2d8bf3..eb919246c 100644
--- a/src/core/hle/kernel/mutex.cpp
+++ b/src/core/hle/kernel/mutex.cpp
@@ -140,7 +140,7 @@ ResultCode Mutex::Release(VAddr address) {
     thread->SetMutexWaitAddress(0);
     thread->SetWaitHandle(0);
 
-    Core::System::GetInstance().PrepareReschedule();
+    system.PrepareReschedule();
 
     return RESULT_SUCCESS;
 }
-- 
cgit v1.2.3


From 44e09e5f21915391672558940842b92e3a64cb1b Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow
Date: Mon, 7 Oct 2019 18:57:13 -0400
Subject: Kernel: Correct Results in Condition Variables and Mutexes

---
 src/core/hle/kernel/mutex.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/core/hle/kernel/mutex.cpp')

diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp
index eb919246c..663d0f4b6 100644
--- a/src/core/hle/kernel/mutex.cpp
+++ b/src/core/hle/kernel/mutex.cpp
@@ -139,6 +139,7 @@ ResultCode Mutex::Release(VAddr address) {
     thread->SetCondVarWaitAddress(0);
     thread->SetMutexWaitAddress(0);
     thread->SetWaitHandle(0);
+    thread->SetWaitSynchronizationResult(RESULT_SUCCESS);
 
     system.PrepareReschedule();
 
-- 
cgit v1.2.3