From 46feea39cdec59c7b96c2bcd8f08e04322cbae91 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 21 Jun 2015 16:13:35 +0000 Subject: [PATCH] TAStudio - account for a button name of "P" rather than assume it is a player number indicator, fixes issue #431 --- .../tools/TAStudio/TAStudio.MenuItems.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index b8e9c6992a..a850d1b21b 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -893,10 +893,15 @@ namespace BizHawk.Client.EmuHawk (sender.OwnerItem as ToolStripMenuItem).ShowDropDown(); }; - if (column.Name.StartsWith("P") && char.IsNumber(column.Name, 1)) + if (column.Name.StartsWith("P") && column.Name.Length > 1 && char.IsNumber(column.Name, 1)) + { player = int.Parse(column.Name[1].ToString()); + } else + { player = 0; + } + playerMenus[player].DropDownItems.Add(menuItem); }