summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-10-10 14:50:41 +0200
committerFernandoS27 <fsahmkow27@gmail.com>2019-10-15 17:55:21 +0200
commit96b1b144afff4ae4dd2d33547b8a62c46c920a84 (patch)
tree9da69a571b8d77a51b00fc3d6ca6cb9b0a30bf22 /src/core
parentKernel: Corrections to Wait Objects clearing in which a thread could still be signalled after a timeout or a cancel. (diff)
downloadyuzu-96b1b144afff4ae4dd2d33547b8a62c46c920a84.tar
yuzu-96b1b144afff4ae4dd2d33547b8a62c46c920a84.tar.gz
yuzu-96b1b144afff4ae4dd2d33547b8a62c46c920a84.tar.bz2
yuzu-96b1b144afff4ae4dd2d33547b8a62c46c920a84.tar.lz
yuzu-96b1b144afff4ae4dd2d33547b8a62c46c920a84.tar.xz
yuzu-96b1b144afff4ae4dd2d33547b8a62c46c920a84.tar.zst
yuzu-96b1b144afff4ae4dd2d33547b8a62c46c920a84.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/kernel/thread.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 563a99bfc..0871a2f00 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -354,9 +354,7 @@ void Thread::SetActivity(ThreadActivity value) {
if (value == ThreadActivity::Paused) {
// Set status if not waiting
- if (status == ThreadStatus::Ready) {
- status = ThreadStatus::Paused;
- } else if (status == ThreadStatus::Running) {
+ if (status == ThreadStatus::Ready || status == ThreadStatus::Running) {
SetStatus(ThreadStatus::Paused);
Core::System::GetInstance().CpuCore(processor_id).PrepareReschedule();
}