Address comments from piplup55 and LotP1
This commit is contained in:
parent
265c8c4370
commit
a7f8eb4381
@ -84,15 +84,25 @@ namespace Ryujinx.HLE.Loaders.Processes
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool isGame = ProgramId > 0x0100000000007FFF;
|
bool IsFirmware(ulong programId)
|
||||||
|
{
|
||||||
|
return programId switch
|
||||||
|
{
|
||||||
|
>= 0x0100000000000819 and <= 0x010000000000081C => true,
|
||||||
|
_ => false
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
string name = isGame || !string.IsNullOrWhiteSpace(Name)
|
bool isFirmware = IsFirmware(ProgramId);
|
||||||
? Name
|
bool isMiiEdit = ProgramId == 0x0100000000001009;
|
||||||
|
|
||||||
|
string name = !isFirmware
|
||||||
|
? isMiiEdit ? "miiEdit from Firmware" : (!string.IsNullOrWhiteSpace(Name) ? Name : "<Unknown Name>")
|
||||||
: "Firmware";
|
: "Firmware";
|
||||||
|
|
||||||
// TODO: LibHac npdm currently doesn't support version field.
|
// TODO: LibHac npdm currently doesn't support version field.
|
||||||
string version = isGame || !string.IsNullOrWhiteSpace(DisplayVersion)
|
string version = !isFirmware && !isMiiEdit
|
||||||
? DisplayVersion
|
? (!string.IsNullOrWhiteSpace(DisplayVersion) ? DisplayVersion : "<Unknown Version>")
|
||||||
: device.System.ContentManager.GetCurrentFirmwareVersion()?.VersionString ?? "?";
|
: device.System.ContentManager.GetCurrentFirmwareVersion()?.VersionString ?? "?";
|
||||||
|
|
||||||
Logger.Info?.Print(LogClass.Loader, $"Application Loaded: {name} v{version} [{ProgramIdText}] [{(Is64Bit ? "64-bit" : "32-bit")}]");
|
Logger.Info?.Print(LogClass.Loader, $"Application Loaded: {name} v{version} [{ProgramIdText}] [{(Is64Bit ? "64-bit" : "32-bit")}]");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user