drashna/ryujinx
1
0
Fork 0
Code Activity Actions

Fix ThreadingLock deadlock on invalid access and TerminateProcess (#3407)

Browse source
This commit is contained in:
gdkchan 2022-06-23 21:53:16 -03:00 • committed by GitHub
parent e747f5cd83
commit 232b1012b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs
View file

@ -966,6 +966,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
SignalExitToDebugExited();
SignalExit();
}
KernelStatic.GetCurrentThread().Exit();
}
private void UnpauseAndTerminateAllThreadsExcept(KThread currentThread)
@ -981,7 +983,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
foreach (KThread thread in _threads)
{
if ((thread.SchedFlags & ThreadSchedState.LowMask) != ThreadSchedState.TerminationPending)
if (thread != currentThread && (thread.SchedFlags & ThreadSchedState.LowMask) != ThreadSchedState.TerminationPending)
{
thread.PrepareForTermination();
}