diff options
| author | TSRBerry <20988865+TSRBerry@users.noreply.github.com> | 2023-04-12 03:09:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-12 01:09:47 +0000 |
| commit | e187a8870a6f19ac0a85b08aece3c1a1e196e379 (patch) | |
| tree | e31d9c1b1594db1d01e53b99315ba7ef3f785373 /Ryujinx.HLE/Loaders/Processes/ProcessResult.cs | |
| parent | a64fee29dc6b8e523d61abb7e79ceaa95a558c6c (diff) | |
HLE: Deal with empty title names properly (#4643)1.1.707
* hle: Deal with empty titleNames in some languages
* gui: Fix displaying the wrong title name
* Remove unnecessary bounds check
* Fix a NRE when getting the version string
* Restore empty string logic
Diffstat (limited to 'Ryujinx.HLE/Loaders/Processes/ProcessResult.cs')
| -rw-r--r-- | Ryujinx.HLE/Loaders/Processes/ProcessResult.cs | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/Ryujinx.HLE/Loaders/Processes/ProcessResult.cs b/Ryujinx.HLE/Loaders/Processes/ProcessResult.cs index b9596c8f..2801e4e0 100644 --- a/Ryujinx.HLE/Loaders/Processes/ProcessResult.cs +++ b/Ryujinx.HLE/Loaders/Processes/ProcessResult.cs @@ -5,6 +5,7 @@ using Ryujinx.Cpu; using Ryujinx.HLE.HOS.SystemState; using Ryujinx.HLE.Loaders.Processes.Extensions; using Ryujinx.Horizon.Common; +using System.Linq; namespace Ryujinx.HLE.Loaders.Processes { @@ -21,8 +22,9 @@ namespace Ryujinx.HLE.Loaders.Processes public readonly ApplicationControlProperty ApplicationControlProperties; public readonly ulong ProcessId; - public string Name; - public ulong ProgramId; + public readonly string Name; + public readonly string DisplayVersion; + public readonly ulong ProgramId; public readonly string ProgramIdText; public readonly bool Is64Bit; public readonly bool DiskCacheEnabled; @@ -52,20 +54,17 @@ namespace Ryujinx.HLE.Loaders.Processes { ulong programId = metaLoader.GetProgramId(); - if (ApplicationControlProperties.Title.ItemsRo.Length > 0) - { - var langIndex = ApplicationControlProperties.Title.ItemsRo.Length > (int)titleLanguage ? (int)titleLanguage : 0; + Name = ApplicationControlProperties.Title[(int)titleLanguage].NameString.ToString(); - Name = ApplicationControlProperties.Title[langIndex].NameString.ToString(); - } - else + if (string.IsNullOrWhiteSpace(Name)) { - Name = metaLoader.GetProgramName(); + Name = ApplicationControlProperties.Title.ItemsRo.ToArray().FirstOrDefault(x => x.Name[0] != 0).NameString.ToString(); } - ProgramId = programId; - ProgramIdText = $"{programId:x16}"; - Is64Bit = metaLoader.IsProgram64Bit(); + DisplayVersion = ApplicationControlProperties.DisplayVersionString.ToString(); + ProgramId = programId; + ProgramIdText = $"{programId:x16}"; + Is64Bit = metaLoader.IsProgram64Bit(); } DiskCacheEnabled = diskCacheEnabled; @@ -85,20 +84,11 @@ namespace Ryujinx.HLE.Loaders.Processes } // TODO: LibHac npdm currently doesn't support version field. - string version; - - if (ProgramId > 0x0100000000007FFF) - { - version = ApplicationControlProperties.DisplayVersionString.ToString(); - } - else - { - version = device.System.ContentManager.GetCurrentFirmwareVersion().VersionString; - } + string version = ProgramId > 0x0100000000007FFF ? DisplayVersion : device.System.ContentManager.GetCurrentFirmwareVersion()?.VersionString ?? "?"; Logger.Info?.Print(LogClass.Loader, $"Application Loaded: {Name} v{version} [{ProgramIdText}] [{(Is64Bit ? "64-bit" : "32-bit")}]"); return true; } } -}
\ No newline at end of file +} |