From 69aa909fc567864582142609f385f1f2ce5b914e Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Tue, 31 Mar 2020 23:42:43 +1000
Subject: [PATCH] Revert previous fix which didn't work and set DisplayName
 properly

fixup e22c2ae11
---
 BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs      | 6 +-----
 .../tools/VirtualPads/schema/PadSchemaControl.cs            | 5 +++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs
index 1f93d59ba6..b9f3605bc7 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs
@@ -53,11 +53,7 @@ namespace BizHawk.Client.EmuHawk
 				var buttonControl = new VirtualPadButton
 				{
 					Name = button.Name,
-					Text = button.Icon != null
-						? null
-						: string.IsNullOrWhiteSpace(button.DisplayName)
-							? button.Name
-							: button.DisplayName,
+					Text = button.Icon != null ? null : button.DisplayName,
 					Location = UIHelper.Scale(button.Location),
 					Image = button.Icon
 				};
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchemaControl.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchemaControl.cs
index 2d867f0b02..c63b69fdc4 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchemaControl.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchemaControl.cs
@@ -25,7 +25,7 @@ namespace BizHawk.Client.EmuHawk
 	/// <summary>A single on/off button</summary>
 	public sealed class ButtonSchema : PadSchemaControl
 	{
-		public string? DisplayName { get; set; }
+		public string DisplayName { get; set; }
 
 		public Bitmap? Icon { get; set; }
 
@@ -34,7 +34,8 @@ namespace BizHawk.Client.EmuHawk
 			=> DisplayName = name;
 
 		public ButtonSchema(int x, int y, int controller, string name)
-			: base(new Point(x, y), $"P{controller} {name}") {}
+			: base(new Point(x, y), $"P{controller} {name}")
+			=> DisplayName = name;
 
 		public static ButtonSchema Up(int x, int y, string? name = null)
 			=> new ButtonSchema(x, y, name ?? "Up") { Icon = Resources.BlueUp };