From 730d2f4b9b86229a0a3cf89dfaf5b71bd4460afa Mon Sep 17 00:00:00 2001 From: Mary Date: Wed, 31 Aug 2022 19:41:43 +0200 Subject: [PATCH] Address gdkchan's comment --- .../HOS/Services/Account/Acc/IAsyncContext.cs | 20 +++++++++---------- .../IAsyncNetworkServiceLicenseKindContext.cs | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Ryujinx.HLE/HOS/Services/Account/Acc/IAsyncContext.cs b/Ryujinx.HLE/HOS/Services/Account/Acc/IAsyncContext.cs index 9c7cb2e0..b49a44e7 100644 --- a/Ryujinx.HLE/HOS/Services/Account/Acc/IAsyncContext.cs +++ b/Ryujinx.HLE/HOS/Services/Account/Acc/IAsyncContext.cs @@ -7,18 +7,18 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc { class IAsyncContext : IpcService { - protected AsyncExecution _asyncExecution; + protected AsyncExecution AsyncExecution; public IAsyncContext(AsyncExecution asyncExecution) { - _asyncExecution = asyncExecution; + AsyncExecution = asyncExecution; } [CommandHipc(0)] // GetSystemEvent() -> handle public ResultCode GetSystemEvent(ServiceCtx context) { - if (context.Process.HandleTable.GenerateHandle(_asyncExecution.SystemEvent.ReadableEvent, out int _systemEventHandle) != KernelResult.Success) + if (context.Process.HandleTable.GenerateHandle(AsyncExecution.SystemEvent.ReadableEvent, out int _systemEventHandle) != KernelResult.Success) { throw new InvalidOperationException("Out of handles!"); } @@ -32,14 +32,14 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc // Cancel() public ResultCode Cancel(ServiceCtx context) { - if (!_asyncExecution.IsInitialized) + if (!AsyncExecution.IsInitialized) { return ResultCode.AsyncExecutionNotInitialized; } - if (_asyncExecution.IsRunning) + if (AsyncExecution.IsRunning) { - _asyncExecution.Cancel(); + AsyncExecution.Cancel(); } return ResultCode.Success; @@ -49,12 +49,12 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc // HasDone() -> b8 public ResultCode HasDone(ServiceCtx context) { - if (!_asyncExecution.IsInitialized) + if (!AsyncExecution.IsInitialized) { return ResultCode.AsyncExecutionNotInitialized; } - context.ResponseData.Write(_asyncExecution.SystemEvent.ReadableEvent.IsSignaled()); + context.ResponseData.Write(AsyncExecution.SystemEvent.ReadableEvent.IsSignaled()); return ResultCode.Success; } @@ -63,12 +63,12 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc // GetResult() public ResultCode GetResult(ServiceCtx context) { - if (!_asyncExecution.IsInitialized) + if (!AsyncExecution.IsInitialized) { return ResultCode.AsyncExecutionNotInitialized; } - if (!_asyncExecution.SystemEvent.ReadableEvent.IsSignaled()) + if (!AsyncExecution.SystemEvent.ReadableEvent.IsSignaled()) { return ResultCode.Unknown41; } diff --git a/Ryujinx.HLE/HOS/Services/Account/Acc/IAsyncNetworkServiceLicenseKindContext.cs b/Ryujinx.HLE/HOS/Services/Account/Acc/IAsyncNetworkServiceLicenseKindContext.cs index 6aab85fb..e62663e6 100644 --- a/Ryujinx.HLE/HOS/Services/Account/Acc/IAsyncNetworkServiceLicenseKindContext.cs +++ b/Ryujinx.HLE/HOS/Services/Account/Acc/IAsyncNetworkServiceLicenseKindContext.cs @@ -15,12 +15,12 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc // GetNetworkServiceLicenseKind() -> nn::account::NetworkServiceLicenseKind public ResultCode GetNetworkServiceLicenseKind(ServiceCtx context) { - if (!_asyncExecution.IsInitialized) + if (!AsyncExecution.IsInitialized) { return ResultCode.AsyncExecutionNotInitialized; } - if (!_asyncExecution.SystemEvent.ReadableEvent.IsSignaled()) + if (!AsyncExecution.SystemEvent.ReadableEvent.IsSignaled()) { return ResultCode.Unknown41; }