summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2018-10-14 14:31:35 -0400
committerGravatar GitHub2018-10-14 14:31:35 -0400
commitb183ce43656c25db769f26ac081b8588ef55bd95 (patch)
tree6eff3c5a144552e44da2750a0c04f0b002cd6889
parentMerge pull request #1409 from DarkLordZach/key-derivation (diff)
parentStop all threads on svcBreak (diff)
downloadyuzu-b183ce43656c25db769f26ac081b8588ef55bd95.tar.gz
yuzu-b183ce43656c25db769f26ac081b8588ef55bd95.tar.xz
yuzu-b183ce43656c25db769f26ac081b8588ef55bd95.zip
Merge pull request #1495 from ogniK5377/break-stop
Stop all threads on svcBreak
-rw-r--r--src/core/hle/kernel/svc.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index e406df829..198865fd0 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -389,6 +389,12 @@ static void Break(u32 reason, u64 info1, u64 info2) {
389 "Emulated program broke execution! reason=0x{:016X}, info1=0x{:016X}, info2=0x{:016X}", 389 "Emulated program broke execution! reason=0x{:016X}, info1=0x{:016X}, info2=0x{:016X}",
390 reason, info1, info2); 390 reason, info1, info2);
391 ASSERT(false); 391 ASSERT(false);
392
393 Core::CurrentProcess()->PrepareForTermination();
394
395 // Kill the current thread
396 GetCurrentThread()->Stop();
397 Core::System::GetInstance().PrepareReschedule();
392 } 398 }
393} 399}
394 400