From 02efe6971104833cccefffe27e029e88560f8ace Mon Sep 17 00:00:00 2001 From: Ac_K Date: Tue, 10 Sep 2019 06:35:52 +0200 Subject: [PATCH] Fix helper 2 --- Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs | 2 +- .../HOS/Services/Arp/ApplicationLaunchProperty.cs | 15 ++++++--------- .../Arp/ApplicationLaunchPropertyHelper.cs | 1 - 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs b/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs index 5513678739..4d8c80f3ee 100644 --- a/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs +++ b/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs @@ -173,7 +173,7 @@ namespace Ryujinx.HLE.HOS.Services.Acc /* if (nn::arp::detail::IReader::GetApplicationLaunchProperty() == 0xCC9D) // InvalidProcessId { - _applicationLaunchProperty = ApplicationLaunchProperty.GetDefault(); + _applicationLaunchProperty = ApplicationLaunchProperty.Default; return ResultCode.InvalidArgument; } diff --git a/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs b/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs index d21e66032d..1eba0eff56 100644 --- a/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs +++ b/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs @@ -10,15 +10,12 @@ namespace Ryujinx.HLE.HOS.Services.Arp public byte UpdateGameStorageId; public short Padding; - public static ApplicationLaunchProperty GetDefault() + public static readonly ApplicationLaunchProperty Default = new ApplicationLaunchProperty { - return new ApplicationLaunchProperty - { - TitleId = 0x00, - Version = 0x00, - BaseGameStorageId = (byte)StorageId.NandSystem, - UpdateGameStorageId = (byte)StorageId.None - }; - } + TitleId = 0x00, + Version = 0x00, + BaseGameStorageId = (byte)StorageId.NandSystem, + UpdateGameStorageId = (byte)StorageId.None + }; } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchPropertyHelper.cs b/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchPropertyHelper.cs index 248385c2bb..aa14d92400 100644 --- a/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchPropertyHelper.cs +++ b/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchPropertyHelper.cs @@ -1,7 +1,6 @@ using Ryujinx.HLE.FileSystem; using Ryujinx.HLE.Utilities; using System; -using System.Collections.Generic; namespace Ryujinx.HLE.HOS.Services.Arp {