From a7f8eb43814f3dfa100966be87ceab4aa6046c2e Mon Sep 17 00:00:00 2001 From: WilliamWsyHK Date: Wed, 4 Dec 2024 01:38:04 +0800 Subject: [PATCH] Address comments from piplup55 and LotP1 --- .../Loaders/Processes/ProcessResult.cs | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/Ryujinx.HLE/Loaders/Processes/ProcessResult.cs b/src/Ryujinx.HLE/Loaders/Processes/ProcessResult.cs index 0329f5830..e579751d8 100644 --- a/src/Ryujinx.HLE/Loaders/Processes/ProcessResult.cs +++ b/src/Ryujinx.HLE/Loaders/Processes/ProcessResult.cs @@ -84,15 +84,25 @@ namespace Ryujinx.HLE.Loaders.Processes return false; } - bool isGame = ProgramId > 0x0100000000007FFF; + bool IsFirmware(ulong programId) + { + return programId switch + { + >= 0x0100000000000819 and <= 0x010000000000081C => true, + _ => false + }; + } + + bool isFirmware = IsFirmware(ProgramId); + bool isMiiEdit = ProgramId == 0x0100000000001009; - string name = isGame || !string.IsNullOrWhiteSpace(Name) - ? Name + string name = !isFirmware + ? isMiiEdit ? "miiEdit from Firmware" : (!string.IsNullOrWhiteSpace(Name) ? Name : "") : "Firmware"; // TODO: LibHac npdm currently doesn't support version field. - string version = isGame || !string.IsNullOrWhiteSpace(DisplayVersion) - ? DisplayVersion + string version = !isFirmware && !isMiiEdit + ? (!string.IsNullOrWhiteSpace(DisplayVersion) ? DisplayVersion : "") : device.System.ContentManager.GetCurrentFirmwareVersion()?.VersionString ?? "?"; Logger.Info?.Print(LogClass.Loader, $"Application Loaded: {name} v{version} [{ProgramIdText}] [{(Is64Bit ? "64-bit" : "32-bit")}]");