hia: Fix last used profile loading, (hopefully) fixed logo loading

src/Ryujinx/Headless/HeadlessRyujinx.cs

@@ -87,19 +87,8 @@ namespace Ryujinx.Headless
             // Initialize Discord integration.
             DiscordIntegrationModule.Initialize();
 
-            ReloadConfig();
-
             // Logging system information.
             Program.PrintSystemInfo();
-
-            // Check if keys exists.
-            if (!File.Exists(Path.Combine(AppDataManager.KeysDirPath, "prod.keys")))
-            {
-                if (!(AppDataManager.Mode == AppDataManager.LaunchMode.UserProfile && File.Exists(Path.Combine(AppDataManager.KeysDirPathUser, "prod.keys"))))
-                {
-                    Logger.Error?.Print(LogClass.Application, "Keys not found");
-                }
-            }
         }
 
         public static void Entrypoint(string[] args)
@@ -152,7 +141,11 @@ namespace Ryujinx.Headless
             string configurationPath = null;
             
             // Now load the configuration as the other subsystems are now registered
-            if (File.Exists(localConfigurationPath))
+            if (customConfigPath != null && File.Exists(customConfigPath))
+            {
+                configurationPath = customConfigPath;
+            } 
+            else if (File.Exists(localConfigurationPath))
             {
                 configurationPath = localConfigurationPath;
             }
@@ -160,10 +153,6 @@ namespace Ryujinx.Headless
             {
                 configurationPath = appDataConfigurationPath;
             }
-            else if (File.Exists(customConfigPath))
-            {
-                configurationPath = customConfigPath;
-            }
 
             if (configurationPath == null)
             {
@@ -423,11 +412,30 @@ namespace Ryujinx.Headless
         {
             Initialize();
 
+            bool useLastUsedProfile = false;
+
             if (option.InheritConfig)
-                option.InheritMainConfig(originalArgs, ConfigurationState.Instance, out _inputConfiguration);
+            {
+                option.InheritMainConfig(originalArgs, ConfigurationState.Instance, out _inputConfiguration,
+                    out useLastUsedProfile);
+            }
 
             AppDataManager.Initialize(option.BaseDataDir);
-
+            
+            if (useLastUsedProfile && AccountSaveDataManager.GetLastUsedUser().TryGet(out var profile))
+                option.UserProfile = profile.Name;
+            
+            // Check if keys exists.
+            if (!File.Exists(Path.Combine(AppDataManager.KeysDirPath, "prod.keys")))
+            {
+                if (!(AppDataManager.Mode == AppDataManager.LaunchMode.UserProfile && File.Exists(Path.Combine(AppDataManager.KeysDirPathUser, "prod.keys"))))
+                {
+                    Logger.Error?.Print(LogClass.Application, "Keys not found");
+                }
+            }
+            
+            ReloadConfig();
+            
             _virtualFileSystem = VirtualFileSystem.CreateInstance();
             _libHacHorizonManager = new LibHacHorizonManager();
 

src/Ryujinx/Headless/Options.cs

@@ -17,11 +17,10 @@ namespace Ryujinx.Headless
     {
         // General
 
-        public void InheritMainConfig(string[] originalArgs, ConfigurationState configurationState, out List<InputConfig> inputConfigs)
+        public void InheritMainConfig(string[] originalArgs, ConfigurationState configurationState, out List<InputConfig> inputConfigs, out bool needsProfileSet)
         {
-            if (NeedsOverride(nameof(UserProfile)) && AccountSaveDataManager.GetLastUsedUser().TryGet(out var profile))
-                UserProfile = profile.Name;
-            
+            needsProfileSet = NeedsOverride(nameof(UserProfile));
+
             if (NeedsOverride(nameof(IsFullscreen)))
                 IsFullscreen = configurationState.UI.StartFullscreen;
 

src/Ryujinx/Headless/WindowBase.cs

@@ -137,7 +137,7 @@ namespace Ryujinx.Headless
 
         private void SetWindowIcon()
         {
-            Stream iconStream = typeof(WindowBase).Assembly.GetManifestResourceStream("Ryujinx.Headless.SDL2.Ryujinx.bmp");
+            Stream iconStream = typeof(Program).Assembly.GetManifestResourceStream("HeadlessLogo");
             byte[] iconBytes = new byte[iconStream!.Length];
 
             if (iconStream.Read(iconBytes, 0, iconBytes.Length) != iconBytes.Length)

src/Ryujinx/Program.cs

@@ -54,7 +54,7 @@ namespace Ryujinx.Ava
 
             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;

src/Ryujinx/Ryujinx.csproj

@@ -163,7 +163,7 @@
     <EmbeddedResource Include="Assets\Icons\Controller_JoyConPair.svg" />
     <EmbeddedResource Include="Assets\Icons\Controller_JoyConRight.svg" />
     <EmbeddedResource Include="Assets\Icons\Controller_ProCon.svg" />
-    <EmbeddedResource Include="Headless\Ryujinx.bmp" />
+    <EmbeddedResource Include="Headless\Ryujinx.bmp" LogicalName="HeadlessLogo" />
   </ItemGroup>
   <ItemGroup>
     <AdditionalFiles Include="Assets\Locales\en_US.json" />