FIx conflicts

This commit is contained in:
Isaac Marovitz 2024-07-16 22:37:02 +01:00
parent 7927cd230b
commit 174a3b8ce6
No known key found for this signature in database
GPG key ID: 97250B2B09A132E1

View file

@ -169,7 +169,7 @@ namespace Ryujinx.Ava.UI.ViewModels
}
}
private void AddUpdate(string path, bool ignoreNotFound = false)
private void AddUpdate(string path, bool ignoreNotFound = false, bool select = false)
{
if (!File.Exists(path) || TitleUpdates.Any(x => x.Path == path))
{
@ -204,7 +204,13 @@ namespace Ryujinx.Ava.UI.ViewModels
controlNca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.None).OpenFile(ref nacpFile.Ref, "/control.nacp".ToU8Span(), OpenMode.Read).ThrowIfFailure();
nacpFile.Get.Read(out _, 0, SpanHelpers.AsByteSpan(ref controlData), ReadOption.None).ThrowIfFailure();
TitleUpdates.Add(new TitleUpdateModel(controlData, path));
var update = new TitleUpdateModel(controlData, path);
TitleUpdates.Add(update);
if (select)
{
Dispatcher.UIThread.InvokeAsync(() => SelectedUpdate = update);
}
}
else
{
@ -245,7 +251,7 @@ namespace Ryujinx.Ava.UI.ViewModels
foreach (var file in result)
{
AddUpdate(file.Path.LocalPath);
AddUpdate(file.Path.LocalPath, select: true);
}
SortUpdates();