aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs
diff options
context:
space:
mode:
authorSteveice10 <1269164+Steveice10@users.noreply.github.com>2023-03-01 18:42:27 -0800
committerGitHub <noreply@github.com>2023-03-01 23:42:27 -0300
commitecee34a50cd8e4266cb2ecc9910d8d33d612c84a (patch)
tree066bfe1147cabb93390217641d34ee1382dd84c7 /Ryujinx.HLE/FileSystem/VirtualFileSystem.cs
parent9b5a0c388980b16f7adfceb1f57320087bfc6322 (diff)
Update LibHac to 0.18.0 (#4414)1.1.647
* Update LibHac to 0.18.0 * Change instance of AsBytes(CreateReadOnlySpan(...)) to AsReadOnlyByteSpan(...)
Diffstat (limited to 'Ryujinx.HLE/FileSystem/VirtualFileSystem.cs')
-rw-r--r--Ryujinx.HLE/FileSystem/VirtualFileSystem.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs b/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs
index 0b91d3a2..3f94ce61 100644
--- a/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs
+++ b/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs
@@ -260,15 +260,16 @@ namespace Ryujinx.HLE.FileSystem
{
using var ticketFile = new UniqueRef<IFile>();
- Result result = fs.OpenFile(ref ticketFile.Ref(), ticketEntry.FullPath.ToU8Span(), OpenMode.Read);
+ Result result = fs.OpenFile(ref ticketFile.Ref, ticketEntry.FullPath.ToU8Span(), OpenMode.Read);
if (result.IsSuccess())
{
Ticket ticket = new Ticket(ticketFile.Get.AsStream());
+ var titleKey = ticket.GetTitleKey(KeySet);
- if (ticket.TitleKeyType == TitleKeyType.Common)
+ if (titleKey != null)
{
- KeySet.ExternalKeySet.Add(new RightsId(ticket.RightsId), new AccessKey(ticket.GetTitleKey(KeySet)));
+ KeySet.ExternalKeySet.Add(new RightsId(ticket.RightsId), new AccessKey(titleKey));
}
}
}
@@ -302,7 +303,7 @@ namespace Ryujinx.HLE.FileSystem
using var iterator = new UniqueRef<SaveDataIterator>();
- Result rc = hos.Fs.OpenSaveDataIterator(ref iterator.Ref(), spaceId);
+ Result rc = hos.Fs.OpenSaveDataIterator(ref iterator.Ref, spaceId);
if (rc.IsFailure()) return rc;
while (true)