From 51065d91290e41a9d2518f44c9bdf83a9b0017ab Mon Sep 17 00:00:00 2001 From: gdkchan Date: Sat, 11 Nov 2023 23:35:30 -0300 Subject: Revert "Add support for multi game XCIs (#5638)" (#5914) This reverts commit 5c3cfb84c09b0566da677425915afa0b2d76da55. --- src/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'src/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs') diff --git a/src/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs b/src/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs index 352ac4e5..c78f4160 100644 --- a/src/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs +++ b/src/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs @@ -4,7 +4,6 @@ using Avalonia.Controls.Primitives; using Avalonia.Interactivity; using Avalonia.Threading; using FluentAvalonia.UI.Controls; -using LibHac.Tools.FsSystem; using Ryujinx.Ava.Common; using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.Input; @@ -24,6 +23,7 @@ using Ryujinx.Ui.Common; using Ryujinx.Ui.Common.Configuration; using Ryujinx.Ui.Common.Helper; using System; +using System.IO; using System.Runtime.Versioning; using System.Threading; using System.Threading.Tasks; @@ -139,7 +139,9 @@ namespace Ryujinx.Ava.UI.Windows { ViewModel.SelectedIcon = args.Application.Icon; - ViewModel.LoadApplication(args.Application).Wait(); + string path = new FileInfo(args.Application.Path).FullName; + + ViewModel.LoadApplication(path).Wait(); } args.Handled = true; @@ -188,11 +190,7 @@ namespace Ryujinx.Ava.UI.Windows LibHacHorizonManager.InitializeBcatServer(); LibHacHorizonManager.InitializeSystemClients(); - IntegrityCheckLevel checkLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks - ? IntegrityCheckLevel.ErrorOnInvalid - : IntegrityCheckLevel.None; - - ApplicationLibrary = new ApplicationLibrary(VirtualFileSystem, checkLevel); + ApplicationLibrary = new ApplicationLibrary(VirtualFileSystem); // Save data created before we supported extra data in directory save data will not work properly if // given empty extra data. Luckily some of that extra data can be created using the data from the @@ -299,12 +297,7 @@ namespace Ryujinx.Ava.UI.Windows { _deferLoad = false; - ApplicationData applicationData = new() - { - Path = _launchPath, - }; - - ViewModel.LoadApplication(applicationData, _startFullscreen).Wait(); + ViewModel.LoadApplication(_launchPath, _startFullscreen).Wait(); } } else -- cgit v1.2.3