summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2019-03-20 21:36:55 -0400
committerGravatar GitHub2019-03-20 21:36:55 -0400
commit872a7bee725b01d611903fe1dfa96a314324b413 (patch)
tree7f154ee4fc6f9922369756d7771cce8de7bb4b8a
parentMerge pull request #2247 from lioncash/include (diff)
parentFix crash caused by 2238. (diff)
downloadyuzu-872a7bee725b01d611903fe1dfa96a314324b413.tar.gz
yuzu-872a7bee725b01d611903fe1dfa96a314324b413.tar.xz
yuzu-872a7bee725b01d611903fe1dfa96a314324b413.zip
Merge pull request #2267 from FernandoS27/fix-2238
Fix crash caused by #2238.
-rw-r--r--src/core/hle/kernel/thread.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index d9ffebc3f..3b22e8e0d 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -314,8 +314,9 @@ void Thread::UpdatePriority() {
314 } 314 }
315 315
316 // Ensure that the thread is within the correct location in the waiting list. 316 // Ensure that the thread is within the correct location in the waiting list.
317 auto old_owner = lock_owner;
317 lock_owner->RemoveMutexWaiter(this); 318 lock_owner->RemoveMutexWaiter(this);
318 lock_owner->AddMutexWaiter(this); 319 old_owner->AddMutexWaiter(this);
319 320
320 // Recursively update the priority of the thread that depends on the priority of this one. 321 // Recursively update the priority of the thread that depends on the priority of this one.
321 lock_owner->UpdatePriority(); 322 lock_owner->UpdatePriority();