hia: fix 2 crashes

Ryubing · Dec 11, 2024 · 1398dad · 1398dad
1 parent 2fc58d5
commit 1398dad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Ryujinx/Headless/HeadlessRyujinx.cs b/src/Ryujinx/Headless/HeadlessRyujinx.cs
@@ -87,8 +87,6 @@ public static void Initialize()
             // Initialize Discord integration.
             DiscordIntegrationModule.Initialize();
 
-            ReloadConfig();
-
             // Logging system information.
             Program.PrintSystemInfo();
 
@@ -422,12 +420,14 @@ private static InputConfig HandlePlayerConfiguration(string inputProfileName, st
         static void Load(string[] originalArgs, Options option)
         {
             Initialize();
-
+            
             if (option.InheritConfig)
                 option.InheritMainConfig(originalArgs, ConfigurationState.Instance, out _inputConfiguration);
-
+            
             AppDataManager.Initialize(option.BaseDataDir);
-
+
+            ReloadConfig();
+
             _virtualFileSystem = VirtualFileSystem.CreateInstance();
             _libHacHorizonManager = new LibHacHorizonManager();
 

diff --git a/src/Ryujinx/Program.cs b/src/Ryujinx/Program.cs
@@ -54,7 +54,7 @@ public static int Main(string[] args)
 
             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..]);
                 return 0;