From 271193251ce36e3f5f691b324e473b102f001549 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 1 Feb 2015 14:08:43 +0000
Subject: [PATCH] PSX - user friendly display names for controller types

---
 .../Consoles/Sony/PSX/Octoshock.cs                    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
index 47b68c131d..3b55236999 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
@@ -948,7 +948,16 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
 			public bool IsConnected { get; set; }
 			public ControllerType Type { get; set; }
 
-			public enum ControllerType { Gamepad, DualAnalog, DualShock }
+			public enum ControllerType
+			{
+				Gamepad,
+
+				[Description("Dual Analog")]
+				DualAnalog,
+
+				[Description("Dual Shock")]
+				DualShock
+			}
 		}
 
 		public class Settings