MeloNX/Ryujinx-ryubing
11
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

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.

Browse Source
This commit is contained in:
Vova 2025-02-13 16:34:03 +10:00
parent 3f185f580c
commit 1dedf4c8d5
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
View File

@ -355,6 +355,11 @@ namespace Ryujinx.Ava.UI.ViewModels
_ => null, _ => null,
}; };
} }
set
{
ListSelectedApplication = value;
GridSelectedApplication = value;
}
} }
public bool HasCompatibilityEntry => SelectedApplication.HasPlayabilityInfo; public bool HasCompatibilityEntry => SelectedApplication.HasPlayabilityInfo;
@ -1541,7 +1546,7 @@ namespace Ryujinx.Ava.UI.ViewModels
{ {
BackendThreadingInit = ConfigurationState.Instance.Graphics.BackendThreading.Value.ToString(); BackendThreadingInit = ConfigurationState.Instance.Graphics.BackendThreading.Value.ToString();
} }
// If a configuration is found in the "/games/xxxxxxxxxxxxxx" folder, the program will load the user setting. // If a configuration is found in the "/games/xxxxxxxxxxxxxx" folder, the program will load the user setting.
string idGame = application.IdBaseString; string idGame = application.IdBaseString;
if (ConfigurationFileFormat.TryLoad(Program.GetDirGameUserConfig(idGame), out ConfigurationFileFormat configurationFileFormat)) if (ConfigurationFileFormat.TryLoad(Program.GetDirGameUserConfig(idGame), out ConfigurationFileFormat configurationFileFormat))

4
src/Ryujinx/UI/Windows/MainWindow.axaml.cs
View File

@ -223,7 +223,7 @@ namespace Ryujinx.Ava.UI.Windows
_deferLoad = true; _deferLoad = true;
_launchPath = launchPathArg; _launchPath = launchPathArg;
_launchApplicationId = launchApplicationId; _launchApplicationId = launchApplicationId;
_startFullscreen = startFullscreenArg; _startFullscreen = startFullscreenArg;
} }
public void SwitchToGameControl(bool startFullscreen = false) public void SwitchToGameControl(bool startFullscreen = false)
@ -374,6 +374,7 @@ namespace Ryujinx.Ava.UI.Windows
if (applicationData != null) if (applicationData != null)
{ {
ViewModel.SelectedApplication = applicationData;
await ViewModel.LoadApplication(applicationData, _startFullscreen); await ViewModel.LoadApplication(applicationData, _startFullscreen);
} }
else else
@ -385,6 +386,7 @@ namespace Ryujinx.Ava.UI.Windows
else else
{ {
applicationData = applications[0]; applicationData = applications[0];
ViewModel.SelectedApplication = applicationData;
await ViewModel.LoadApplication(applicationData, _startFullscreen); await ViewModel.LoadApplication(applicationData, _startFullscreen);
} }
} }