diff options
Diffstat (limited to 'Ryujinx.HLE/HOS')
| -rw-r--r-- | Ryujinx.HLE/HOS/Horizon.cs | 22 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs | 2 |
2 files changed, 11 insertions, 13 deletions
diff --git a/Ryujinx.HLE/HOS/Horizon.cs b/Ryujinx.HLE/HOS/Horizon.cs index 1e218c87..aa01bfc9 100644 --- a/Ryujinx.HLE/HOS/Horizon.cs +++ b/Ryujinx.HLE/HOS/Horizon.cs @@ -105,11 +105,9 @@ namespace Ryujinx.HLE.HOS public Nacp ControlData { get; set; } - public string CurrentTitle { get; private set; } - public string TitleName { get; private set; } - public string TitleID { get; private set; } + public string TitleId { get; private set; } public IntegrityCheckLevel FsIntegrityCheckLevel { get; set; } @@ -366,7 +364,7 @@ namespace Ryujinx.HLE.HOS { ControlData = new Nacp(controlFile.AsStream()); - TitleName = CurrentTitle = ControlData.Descriptions[(int) State.DesiredTitleLanguage].Title; + TitleName = ControlData.Descriptions[(int)State.DesiredTitleLanguage].Title; } } @@ -500,12 +498,12 @@ namespace Ryujinx.HLE.HOS Nacp controlData = new Nacp(controlFile.AsStream()); - TitleName = CurrentTitle = controlData.Descriptions[(int)State.DesiredTitleLanguage].Title; - TitleID = metaData.Aci0.TitleId.ToString("x16"); + TitleName = controlData.Descriptions[(int)State.DesiredTitleLanguage].Title; + TitleId = metaData.Aci0.TitleId.ToString("x16"); - if (string.IsNullOrWhiteSpace(CurrentTitle)) + if (string.IsNullOrWhiteSpace(TitleName)) { - TitleName = CurrentTitle = controlData.Descriptions.ToList().Find(x => !string.IsNullOrWhiteSpace(x.Title)).Title; + TitleName = controlData.Descriptions.ToList().Find(x => !string.IsNullOrWhiteSpace(x.Title)).Title; } return controlData; @@ -517,7 +515,7 @@ namespace Ryujinx.HLE.HOS } else { - TitleID = CurrentTitle = metaData.Aci0.TitleId.ToString("x16"); + TitleId = metaData.Aci0.TitleId.ToString("x16"); } } @@ -557,7 +555,7 @@ namespace Ryujinx.HLE.HOS } } - TitleID = CurrentTitle = metaData.Aci0.TitleId.ToString("x16"); + TitleId = metaData.Aci0.TitleId.ToString("x16"); LoadNso("rtld"); LoadNso("main"); @@ -659,8 +657,8 @@ namespace Ryujinx.HLE.HOS ContentManager.LoadEntries(); - TitleName = CurrentTitle = metaData.TitleName; - TitleID = metaData.Aci0.TitleId.ToString("x16"); + TitleName = metaData.TitleName; + TitleId = metaData.Aci0.TitleId.ToString("x16"); ProgramLoader.LoadStaticObjects(this, metaData, new IExecutable[] { staticObject }); } diff --git a/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs b/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs index c1c6d26d..4962e3ff 100644 --- a/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs +++ b/Ryujinx.HLE/HOS/Services/Arp/ApplicationLaunchProperty.cs @@ -33,7 +33,7 @@ namespace Ryujinx.HLE.HOS.Services.Arp return new ApplicationLaunchProperty { - TitleId = BitConverter.ToInt64(StringUtils.HexToBytes(context.Device.System.TitleID), 0), + TitleId = BitConverter.ToInt64(StringUtils.HexToBytes(context.Device.System.TitleId), 0), Version = 0x00, BaseGameStorageId = (byte)StorageId.NandSystem, UpdateGameStorageId = (byte)StorageId.None |