diff options
| author | 2015-12-27 18:44:42 -0500 | |
|---|---|---|
| committer | 2015-12-27 18:44:42 -0500 | |
| commit | 29032ce9b6de56de60c146832bd88b06062fccac (patch) | |
| tree | 5cdaf69f5ace1bef60152b77a1616ff27bf71221 /src/core/hle/kernel/thread.cpp | |
| parent | Merge pull request #1287 from lioncash/memory (diff) | |
| download | yuzu-29032ce9b6de56de60c146832bd88b06062fccac.tar.gz yuzu-29032ce9b6de56de60c146832bd88b06062fccac.tar.xz yuzu-29032ce9b6de56de60c146832bd88b06062fccac.zip | |
SVC: Fixed ArbitrateAddress to behave as it does on hardware.
This was verified with hwtests that i plan to upload later on.
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index c08fc1c7a..bf32f653d 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp | |||
| @@ -300,7 +300,7 @@ static void ThreadWakeupCallback(u64 thread_handle, int cycles_late) { | |||
| 300 | 300 | ||
| 301 | thread->waitsynch_waited = false; | 301 | thread->waitsynch_waited = false; |
| 302 | 302 | ||
| 303 | if (thread->status == THREADSTATUS_WAIT_SYNCH) { | 303 | if (thread->status == THREADSTATUS_WAIT_SYNCH || thread->status == THREADSTATUS_WAIT_ARB) { |
| 304 | thread->SetWaitSynchronizationResult(ResultCode(ErrorDescription::Timeout, ErrorModule::OS, | 304 | thread->SetWaitSynchronizationResult(ResultCode(ErrorDescription::Timeout, ErrorModule::OS, |
| 305 | ErrorSummary::StatusChanged, ErrorLevel::Info)); | 305 | ErrorSummary::StatusChanged, ErrorLevel::Info)); |
| 306 | 306 | ||