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

Headless in Avalonia v2 #448

Merged
GreemDev merged 16 commits from refactor/ava/headless-in-avalonia-v2 into master 2024-12-28 09:49:06 +00:00
Conversation 3 Commits 16 Files Changed 25 +4 -5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 471034dc2e - Show all commits

9
src/Ryujinx/Program.cs
View File

@ -114,6 +114,9 @@ namespace Ryujinx.Ava
=> 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)
{ {