emu-mirrors/Ryujinx
0
0
Fork 0
mirror of https://github.com/GreemDev/Ryujinx.git synced 2024-12-23 03:25:46 +00:00
Code Wiki Activity

hia: fix 2 crashes

Browse source
This commit is contained in:
Evan Husted 2024-12-11 15:01:28 -06:00
parent 2fc58d58a5
commit 1398dad67c
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Ryujinx/Headless/HeadlessRyujinx.cs
View file

@ -87,8 +87,6 @@ namespace Ryujinx.Headless
// Initialize Discord integration. // Initialize Discord integration.
DiscordIntegrationModule.Initialize(); DiscordIntegrationModule.Initialize();
ReloadConfig();
// Logging system information. // Logging system information.
Program.PrintSystemInfo(); Program.PrintSystemInfo();
@ -422,12 +420,14 @@ namespace Ryujinx.Headless
static void Load(string[] originalArgs, Options option) static void Load(string[] originalArgs, Options option)
{ {
Initialize(); Initialize();
if (option.InheritConfig) if (option.InheritConfig)
option.InheritMainConfig(originalArgs, ConfigurationState.Instance, out _inputConfiguration); option.InheritMainConfig(originalArgs, ConfigurationState.Instance, out _inputConfiguration);
AppDataManager.Initialize(option.BaseDataDir); AppDataManager.Initialize(option.BaseDataDir);
ReloadConfig();
_virtualFileSystem = VirtualFileSystem.CreateInstance(); _virtualFileSystem = VirtualFileSystem.CreateInstance();
_libHacHorizonManager = new LibHacHorizonManager(); _libHacHorizonManager = new LibHacHorizonManager();

2
src/Ryujinx/Program.cs
View file

@ -54,7 +54,7 @@ namespace Ryujinx.Ava
PreviewerDetached = true; PreviewerDetached = true;
if (args[0] is "--no-gui" or "nogui") if (args.Length > 0 && args[0] is "--no-gui" or "nogui")
{ {
HeadlessRyujinx.Entrypoint(args[1..]); HeadlessRyujinx.Entrypoint(args[1..]);
return 0; return 0;