diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 40c54f7f43..2567d092de 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -1463,6 +1463,7 @@
+
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index fab4ba1fe0..cac70f210c 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -35,6 +35,7 @@ using BizHawk.Emulation.Cores.Nintendo.N64;
using BizHawk.Client.EmuHawk.WinFormExtensions;
using BizHawk.Client.EmuHawk.ToolExtensions;
+using BizHawk.Emulation.Cores.Nintendo.SNES9X;
namespace BizHawk.Client.EmuHawk
{
@@ -2496,6 +2497,10 @@ namespace BizHawk.Client.EmuHawk
{
CoreNameStatusBarButton.Image = Properties.Resources.gambatte;
}
+ else if (Global.Emulator is Snes9x)
+ {
+ CoreNameStatusBarButton.Image = Properties.Resources.snes9x;
+ }
else
{
CoreNameStatusBarButton.Image = null;
diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
index 7ee9b033f4..77cbba20bf 100644
--- a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
+++ b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
@@ -1149,6 +1149,16 @@ namespace BizHawk.Client.EmuHawk.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap snes9x {
+ get {
+ object obj = ResourceManager.GetObject("snes9x", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.resx b/BizHawk.Client.EmuHawk/Properties/Resources.resx
index 536c64885f..d271406b93 100644
--- a/BizHawk.Client.EmuHawk/Properties/Resources.resx
+++ b/BizHawk.Client.EmuHawk/Properties/Resources.resx
@@ -954,4 +954,7 @@
..\images\YellowUp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\images\snes9x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/images/snes9x.ico b/BizHawk.Client.EmuHawk/images/snes9x.ico
new file mode 100644
index 0000000000..9bd310bd1e
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/snes9x.ico differ
diff --git a/BizHawk.Client.EmuHawk/images/snes9x.png b/BizHawk.Client.EmuHawk/images/snes9x.png
new file mode 100644
index 0000000000..61683a0761
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/snes9x.png differ