This commit is contained in:
riperiperi 2024-05-20 20:19:49 +01:00
commit 48f86a9935
3 changed files with 3 additions and 10 deletions

View file

@ -1,7 +1,6 @@
using Ryujinx.Common; using Ryujinx.Common;
using Ryujinx.HLE.HOS.Kernel.Process; using Ryujinx.HLE.HOS.Kernel.Process;
using System; using System;
using System.Diagnostics;
using System.Numerics; using System.Numerics;
using System.Threading; using System.Threading;
@ -295,8 +294,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
return; return;
} }
Debug.Assert(currentThread != null);
currentThread.SchedulerWaitEvent.Reset(); currentThread.SchedulerWaitEvent.Reset();
currentThread.ThreadContext.Unlock(); currentThread.ThreadContext.Unlock();

View file

@ -6,7 +6,6 @@ using Ryujinx.HLE.HOS.Kernel.SupervisorCall;
using Ryujinx.Horizon.Common; using Ryujinx.Horizon.Common;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Numerics; using System.Numerics;
using System.Threading; using System.Threading;

View file

@ -514,8 +514,6 @@ namespace Ryujinx.HLE.HOS.Services
protected virtual void Dispose(bool disposing) protected virtual void Dispose(bool disposing)
{ {
if (disposing && _selfThread != null) if (disposing && _selfThread != null)
{
if (_selfThread.HostThread != null)
{ {
if (_selfThread.HostThread.ManagedThreadId != Environment.CurrentManagedThreadId && _selfThread.HostThread.Join(_threadJoinTimeout) == false) if (_selfThread.HostThread.ManagedThreadId != Environment.CurrentManagedThreadId && _selfThread.HostThread.Join(_threadJoinTimeout) == false)
{ {
@ -523,7 +521,6 @@ namespace Ryujinx.HLE.HOS.Services
_selfThread.HostThread.Join(Timeout.Infinite); _selfThread.HostThread.Join(Timeout.Infinite);
} }
}
if (Interlocked.Exchange(ref _isDisposed, 1) == 0) if (Interlocked.Exchange(ref _isDisposed, 1) == 0)
{ {