From 097562bc6c227c42f803ce1078fcb4adf06cd20c Mon Sep 17 00:00:00 2001 From: gdkchan Date: Tue, 25 Apr 2023 19:33:14 -0300 Subject: Add missing check for thread termination on ArbitrateLock (#4722) * Add missing check for thread termination on ArbitrateLock * Use TerminationRequested in all places where it can be used --- Ryujinx.HLE/HOS/Kernel/Ipc/KServerSession.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Ryujinx.HLE/HOS/Kernel/Ipc') diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/KServerSession.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/KServerSession.cs index 9c2184d9..86469c03 100644 --- a/Ryujinx.HLE/HOS/Kernel/Ipc/KServerSession.cs +++ b/Ryujinx.HLE/HOS/Kernel/Ipc/KServerSession.cs @@ -188,8 +188,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc if (request.AsyncEvent == null) { - if (request.ClientThread.ShallBeTerminated || - request.ClientThread.SchedFlags == ThreadSchedState.TerminationPending) + if (request.ClientThread.TerminationRequested) { return KernelResult.ThreadTerminating; } @@ -1104,8 +1103,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc { foreach (KSessionRequest request in IterateWithRemovalOfAllRequests()) { - if (request.ClientThread.ShallBeTerminated || - request.ClientThread.SchedFlags == ThreadSchedState.TerminationPending) + if (request.ClientThread.TerminationRequested) { continue; } -- cgit v1.2.3