From 1dedf4c8d53f6694e7780d39b86ad4b68fd65865 Mon Sep 17 00:00:00 2001 From: Vova Date: Thu, 13 Feb 2025 16:34:03 +1000 Subject: [PATCH] fixed: when loading a game with a custom configuration via a shortcut or rebooting, when entering the settings menu, a menu for global configuration was displayed. --- src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs | 7 ++++++- src/Ryujinx/UI/Windows/MainWindow.axaml.cs | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs index d881bff98..5eca7f498 100644 --- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs @@ -355,6 +355,11 @@ namespace Ryujinx.Ava.UI.ViewModels _ => null, }; } + set + { + ListSelectedApplication = value; + GridSelectedApplication = value; + } } public bool HasCompatibilityEntry => SelectedApplication.HasPlayabilityInfo; @@ -1541,7 +1546,7 @@ namespace Ryujinx.Ava.UI.ViewModels { BackendThreadingInit = ConfigurationState.Instance.Graphics.BackendThreading.Value.ToString(); } - + // If a configuration is found in the "/games/xxxxxxxxxxxxxx" folder, the program will load the user setting. string idGame = application.IdBaseString; if (ConfigurationFileFormat.TryLoad(Program.GetDirGameUserConfig(idGame), out ConfigurationFileFormat configurationFileFormat)) diff --git a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs index 8f50aa965..bf55fac57 100644 --- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs +++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs @@ -223,7 +223,7 @@ namespace Ryujinx.Ava.UI.Windows _deferLoad = true; _launchPath = launchPathArg; _launchApplicationId = launchApplicationId; - _startFullscreen = startFullscreenArg; + _startFullscreen = startFullscreenArg; } public void SwitchToGameControl(bool startFullscreen = false) @@ -374,6 +374,7 @@ namespace Ryujinx.Ava.UI.Windows if (applicationData != null) { + ViewModel.SelectedApplication = applicationData; await ViewModel.LoadApplication(applicationData, _startFullscreen); } else @@ -385,6 +386,7 @@ namespace Ryujinx.Ava.UI.Windows else { applicationData = applications[0]; + ViewModel.SelectedApplication = applicationData; await ViewModel.LoadApplication(applicationData, _startFullscreen); } }