From 6a291d41167d89d79c9df5ffda6fd7aa951c90a1 Mon Sep 17 00:00:00 2001
From: Evan Husted <greem@greemdev.net>
Date: Sat, 18 Jan 2025 10:26:12 -0600
Subject: [PATCH] Headless: Use main UI logo for window icon instead of
 separate bmp

---
 src/Ryujinx/Assets/locales.json            |   8 +++++---
 src/Ryujinx/Headless/Ryujinx.bmp           | Bin 3978 -> 0 bytes
 src/Ryujinx/Headless/Windows/WindowBase.cs |   3 ++-
 src/Ryujinx/Ryujinx.csproj                 |   1 -
 4 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 src/Ryujinx/Headless/Ryujinx.bmp

diff --git a/src/Ryujinx/Assets/locales.json b/src/Ryujinx/Assets/locales.json
index 1a42051b8..d320c935e 100644
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -3946,7 +3946,8 @@
         "zh_CN": "繁体中文（推荐）",
         "zh_TW": "正體中文 (建議)"
       }
-    },    {
+    },
+    {
       "ID": "SettingsTabSystemSystemLanguageSwedish",
       "Translations": {
         "ar_SA": "",
@@ -3970,7 +3971,8 @@
         "zh_CN": "",
         "zh_TW": ""
       }
-    },    {
+    },
+    {
       "ID": "SettingsTabSystemSystemLanguageNorwegian",
       "Translations": {
         "ar_SA": "",
@@ -22896,4 +22898,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/src/Ryujinx/Headless/Ryujinx.bmp b/src/Ryujinx/Headless/Ryujinx.bmp
deleted file mode 100644
index 36bf2f8ac129d43565ea345df7bb33b3b86e251b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3978
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
B6odc(

diff --git a/src/Ryujinx/Headless/Windows/WindowBase.cs b/src/Ryujinx/Headless/Windows/WindowBase.cs
index b2d18fac1..51bfcb214 100644
--- a/src/Ryujinx/Headless/Windows/WindowBase.cs
+++ b/src/Ryujinx/Headless/Windows/WindowBase.cs
@@ -1,6 +1,7 @@
 using Humanizer;
 using LibHac.Tools.Fs;
 using Ryujinx.Ava;
+using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Logging;
@@ -137,7 +138,7 @@ namespace Ryujinx.Headless
 
         private void SetWindowIcon()
         {
-            Stream iconStream = typeof(Program).Assembly.GetManifestResourceStream("HeadlessLogo");
+            Stream iconStream = EmbeddedResources.GetStream("Ryujinx/Assets/UIImages/Logo_Ryujinx.png");
             byte[] iconBytes = new byte[iconStream!.Length];
 
             if (iconStream.Read(iconBytes, 0, iconBytes.Length) != iconBytes.Length)
diff --git a/src/Ryujinx/Ryujinx.csproj b/src/Ryujinx/Ryujinx.csproj
index ab9a3696d..8929ba3eb 100644
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -166,7 +166,6 @@
     <EmbeddedResource Include="Assets\UIImages\Logo_GitHub_Light.png" />
     <EmbeddedResource Include="Assets\UIImages\Logo_Ryujinx.png" />
     <EmbeddedResource Include="Assets\UIImages\Logo_Ryujinx_AntiAlias.png" />
-    <EmbeddedResource Include="Headless\Ryujinx.bmp" LogicalName="HeadlessLogo" />
   </ItemGroup>
   <ItemGroup>
     <AdditionalFiles Include="Assets\locales.json" />