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 20:20:36 +10:00 committed by GitHub
parent e730f144a2
commit a32d9d5b55
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Ryujinx/Program.cs
View File

@ -155,14 +155,18 @@ 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);
// 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))
{ {
@ -174,13 +178,13 @@ namespace Ryujinx.Ava
ConfigurationPath = appDataConfigurationPath; ConfigurationPath = appDataConfigurationPath;
OverrideConfigurationPath = overrideAppDataConfigurationPath; 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(OverrideConfigurationPath);
@ -188,7 +192,7 @@ namespace Ryujinx.Ava
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);
@ -197,11 +201,11 @@ namespace Ryujinx.Ava
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)
@ -210,13 +214,13 @@ namespace Ryujinx.Ava
{ {
ConfigurationPath = overrideLocalConfigurationPath; ConfigurationPath = overrideLocalConfigurationPath;
Logger.Notice.Print(LogClass.Application, $"(args)Loading configuration (Local) from: {ConfigurationPath}"); Logger.Notice.Print(LogClass.Application, $"(args)Loading configuration (Local) from: {ConfigurationPath}");
} }
else else
{ {
Logger.Notice.Print(LogClass.Application, $"File not found(Local): {overrideLocalConfigurationPath}"); Logger.Notice.Print(LogClass.Application, $"File not found(Local): {overrideLocalConfigurationPath}");
} }
if (File.Exists(overrideAppDataConfigurationPath)) if (File.Exists(overrideAppDataConfigurationPath))
{ {
ConfigurationPath = overrideAppDataConfigurationPath; ConfigurationPath = overrideAppDataConfigurationPath;