From a24d101f1c5c1d375c2a21d7e693d8f2300bd4fb Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 21 Mar 2020 11:48:37 -0500
Subject: [PATCH] ControllerConfig - more gracefully handle not having a
 controller image

---
 BizHawk.Client.EmuHawk/config/ControllerConfig.cs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
index 92adc48586..e3958758dc 100644
--- a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
@@ -248,10 +248,17 @@ namespace BizHawk.Client.EmuHawk
 		private void SetControllerPicture(string controlName)
 		{
 			ControllerImages.TryGetValue(controlName, out var lazyBmp);
-			var bmp = lazyBmp?.Value ?? Properties.Resources.Help;
-			pictureBox1.Image = bmp;
-			pictureBox1.Size = bmp.Size;
-			tableLayoutPanel1.ColumnStyles[1].Width = bmp.Width;
+			if (lazyBmp != null)
+			{
+				var bmp = lazyBmp.Value;
+				pictureBox1.Image = bmp;
+				pictureBox1.Size = bmp.Size;
+				tableLayoutPanel1.ColumnStyles[1].Width = bmp.Width;
+			}
+			else
+			{
+				tableLayoutPanel1.ColumnStyles[1].Width = 0;
+			}
 
 			// Uberhack
 			if (controlName == "Commodore 64 Controller")