diff options
| author |  bunnei | 2015-12-28 22:23:51 -0500 |
|---|---|---|
| committer | bunnei | 2015-12-28 22:23:51 -0500 |
| commit | 73740d74ed1dabccc8304a0ac4cfb737c91864ba (patch) | |
| tree | b152c877f36be3f1f5da562b469207be9006bdd5 /src/core/hle/kernel/thread.cpp | |
| parent | Merge pull request #1301 from lioncash/mrc-apsr (diff) | |
| parent | SVC: Fixed ArbitrateAddress to behave as it does on hardware. (diff) | |
| download | yuzu-73740d74ed1dabccc8304a0ac4cfb737c91864ba.tar.gz yuzu-73740d74ed1dabccc8304a0ac4cfb737c91864ba.tar.xz yuzu-73740d74ed1dabccc8304a0ac4cfb737c91864ba.zip | |
Merge pull request #1300 from Subv/arbitrateaddress
SVC: Fixed ArbitrateAddress to behave as it does on hardware.
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 | ||