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

Update Program.cs

Browse Source
This commit is contained in:
Vladimir Sokolov 2025-02-01 21:00:11 +10:00 committed by GitHub
parent 447f6be16f
commit 02af61fc09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/Ryujinx/Program.cs
View File

@ -158,54 +158,49 @@ namespace Ryujinx.Ava
public static void ReloadConfig() public static void ReloadConfig()
{ {
string OverrideConfigurationPath = "";
string localConfigurationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ReleaseInformation.ConfigName); string localConfigurationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ReleaseInformation.ConfigName);
string appDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, ReleaseInformation.ConfigName); string appDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, ReleaseInformation.ConfigName);
string overrideLocalConfigurationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ReleaseInformation.CustomConfigNameOverride); string overrideLocalConfigurationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ReleaseInformation.CustomConfigNameOverride);
string overrideAppDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, ReleaseInformation.CustomConfigNameOverride); string overrideAppDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, ReleaseInformation.CustomConfigNameOverride);
Logger.Notice.Print(LogClass.Application, $"Loading configuration (overrideAppDataConfigurationPath)from: {overrideAppDataConfigurationPath}");
// Now load the configuration as the other subsystems are now registered // Now load the configuration as the other subsystems are now registered
if (File.Exists(localConfigurationPath)) if (File.Exists(localConfigurationPath))
{ {
ConfigurationPath = localConfigurationPath; ConfigurationPath = localConfigurationPath;
OverrideConfigurationPath = localConfigurationPath;
} }
else if (File.Exists(appDataConfigurationPath)) else if (File.Exists(appDataConfigurationPath))
{ {
ConfigurationPath = appDataConfigurationPath; ConfigurationPath = appDataConfigurationPath;
OverrideConfigurationPath = overrideAppDataConfigurationPath;
} }
if (ConfigurationPath == null) if (ConfigurationPath == null)
{ {
// No configuration, we load the default values and save it to disk // No configuration, we load the default values and save it to disk
ConfigurationPath = appDataConfigurationPath; ConfigurationPath = appDataConfigurationPath;
Logger.Notice.Print(LogClass.Application, $"No configuration file found. Saving default configuration to: {ConfigurationPath}"); Logger.Notice.Print(LogClass.Application, $"No configuration file found. Saving default configuration to: {ConfigurationPath}");
ConfigurationState.Instance.LoadDefault(); ConfigurationState.Instance.LoadDefault();
ConfigurationState.Instance.ToFileFormat().SaveConfig(ConfigurationPath); ConfigurationState.Instance.ToFileFormat().SaveConfig(ConfigurationPath);
ConfigurationState.Instance.ToFileFormat().SaveConfig(OverrideConfigurationPath); ConfigurationState.Instance.ToFileFormat().SaveConfig(overrideAppDataConfigurationPath);
} }
else else
{ {
Logger.Notice.Print(LogClass.Application, $"Loading configuration from: {ConfigurationPath}"); Logger.Notice.Print(LogClass.Application, $"Loading configuration from: {ConfigurationPath}");
if (ConfigurationFileFormat.TryLoad(ConfigurationPath, out ConfigurationFileFormat configurationFileFormat)) if (ConfigurationFileFormat.TryLoad(ConfigurationPath, out ConfigurationFileFormat configurationFileFormat))
{ {
ConfigurationState.Instance.Load(configurationFileFormat, ConfigurationPath); ConfigurationState.Instance.Load(configurationFileFormat, ConfigurationPath);
ConfigurationState.Instance.ToFileFormat().SaveConfig(OverrideConfigurationPath); ConfigurationState.Instance.ToFileFormat().SaveConfig(overrideAppDataConfigurationPath);
} }
else else
{ {
Logger.Warning?.PrintMsg(LogClass.Application, $"Failed to load config! Loading the default config instead.\nFailed config location: {ConfigurationPath}"); Logger.Warning?.PrintMsg(LogClass.Application, $"Failed to load config! Loading the default config instead.\nFailed config location: {ConfigurationPath}");
ConfigurationState.Instance.LoadDefault(); ConfigurationState.Instance.LoadDefault();
} }
} }
// Copies and reloads the configuration file if the game was loaded with arguments // Copies and reloads the configuration file if the game was loaded with arguments
// based on global configuration // based on global configuration
if (CommandLineState.CountArguments > 0) if (CommandLineState.CountArguments > 0)
@ -213,37 +208,15 @@ namespace Ryujinx.Ava
if (File.Exists(overrideLocalConfigurationPath)) if (File.Exists(overrideLocalConfigurationPath))
{ {
ConfigurationPath = overrideLocalConfigurationPath; ConfigurationPath = overrideLocalConfigurationPath;
Logger.Notice.Print(LogClass.Application, $"(args)Loading configuration (Local) from: {ConfigurationPath}");
} }
else
{
Logger.Notice.Print(LogClass.Application, $"File not found(Local): {overrideLocalConfigurationPath}");
}
if (File.Exists(overrideAppDataConfigurationPath)) if (File.Exists(overrideAppDataConfigurationPath))
{ {
ConfigurationPath = overrideAppDataConfigurationPath; ConfigurationPath = overrideAppDataConfigurationPath;
Logger.Notice.Print(LogClass.Application, $"(args)Loading configuration(AppData) from: {ConfigurationPath}");
}
else
{
Logger.Notice.Print(LogClass.Application, $"File not found(AppData): {overrideAppDataConfigurationPath}");
} }
} }
UseHardwareAcceleration = ConfigurationState.Instance.EnableHardwareAcceleration;
// Check if graphics backend was overridden
if (CommandLineState.OverrideGraphicsBackend is not null)
ConfigurationState.Instance.Graphics.GraphicsBackend.Value = CommandLineState.OverrideGraphicsBackend.ToLower() switch
{
"opengl" => GraphicsBackend.OpenGl,
"vulkan" => GraphicsBackend.Vulkan,
"metal" => GraphicsBackend.Metal,
_ => ConfigurationState.Instance.Graphics.GraphicsBackend
};
// Check if backend threading was overridden // Check if backend threading was overridden
if (CommandLineState.OverrideBackendThreading is not null) if (CommandLineState.OverrideBackendThreading is not null)
ConfigurationState.Instance.Graphics.BackendThreading.Value = CommandLineState.OverrideBackendThreading.ToLower() switch ConfigurationState.Instance.Graphics.BackendThreading.Value = CommandLineState.OverrideBackendThreading.ToLower() switch