deadcade/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Catch HorizonResultException in TryLoad

Browse source
This commit is contained in:
TSR Berry 2024-07-28 22:13:10 +02:00
parent 7fca6ad333
commit 869732e8ed
No known key found for this signature in database
GPG key ID: 52353C0A4CCA15E2
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Ryujinx.HLE/Loaders/Processes/Extensions/PartitionFileSystemExtensions.cs
View file

@ -71,10 +71,11 @@ namespace Ryujinx.HLE.Loaders.Processes.Extensions
if (applicationId == 0) if (applicationId == 0)
{ {
foreach ((ulong _, ContentMetaData content) in applications) foreach ((ulong id, ContentMetaData content) in applications)
{ {
mainNca = content.GetNcaByType(device.FileSystem.KeySet, ContentType.Program, device.Configuration.UserChannelPersistence.Index); mainNca = content.GetNcaByType(device.FileSystem.KeySet, ContentType.Program, device.Configuration.UserChannelPersistence.Index);
controlNca = content.GetNcaByType(device.FileSystem.KeySet, ContentType.Control, device.Configuration.UserChannelPersistence.Index); controlNca = content.GetNcaByType(device.FileSystem.KeySet, ContentType.Control, device.Configuration.UserChannelPersistence.Index);
applicationId = id;
break; break;
} }
} }
@ -142,8 +143,25 @@ namespace Ryujinx.HLE.Loaders.Processes.Extensions
} }
} }
try
{
return (true, mainNca.Load(device, patchNca, controlNca)); return (true, mainNca.Load(device, patchNca, controlNca));
} }
catch (HorizonResultException ex)
{
// The exception message already contains enough information here.
errorMessage = $"Failed to load: {ex.Message}";
return (false, ProcessResult.Failed);
}
catch (Exception ex)
{
// Add the stacktrace in addition to the exception message.
errorMessage = $"Failed to load: {ex}";
return (false, ProcessResult.Failed);
}
}
errorMessage = $"Unable to load: Could not find Main NCA for title \"{applicationId:X16}\""; errorMessage = $"Unable to load: Could not find Main NCA for title \"{applicationId:X16}\"";