This commit is contained in:
Evan Husted 2024-12-09 03:28:16 -06:00
parent a477658b85
commit 75fa7c7d4d

View file

@ -113,6 +113,9 @@ namespace Ryujinx.Ava
AppDomain.CurrentDomain.UnhandledException += (sender, e) AppDomain.CurrentDomain.UnhandledException += (sender, e)
=> ProcessUnhandledException(sender, e.ExceptionObject as Exception, e.IsTerminating); => ProcessUnhandledException(sender, e.ExceptionObject as Exception, e.IsTerminating);
AppDomain.CurrentDomain.ProcessExit += (_, _) => Exit(); AppDomain.CurrentDomain.ProcessExit += (_, _) => Exit();
// Setup base data directory.
AppDataManager.Initialize(CommandLineState.BaseDirPathArg);
// Set the delegate for localizing the word "never" in the UI // Set the delegate for localizing the word "never" in the UI
ApplicationData.LocalizedNever = () => LocaleManager.Instance[LocaleKeys.Never]; ApplicationData.LocalizedNever = () => LocaleManager.Instance[LocaleKeys.Never];
@ -154,7 +157,7 @@ namespace Ryujinx.Ava
} }
} }
public static void ReloadConfig(string customConfigPath = null) public static void ReloadConfig()
{ {
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);
@ -168,10 +171,6 @@ namespace Ryujinx.Ava
{ {
ConfigurationPath = appDataConfigurationPath; ConfigurationPath = appDataConfigurationPath;
} }
else if (File.Exists(customConfigPath))
{
ConfigurationPath = customConfigPath;
}
if (ConfigurationPath == null) if (ConfigurationPath == null)
{ {