From cc33617f746b087d61b18dcc53a9c0295bbff856 Mon Sep 17 00:00:00 2001 From: zeromus Date: Thu, 6 Jul 2017 20:48:46 -0500 Subject: [PATCH] fix crash in snes virtualpad when mouse is used --- BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs index 2b00af225a..1540935632 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs @@ -84,7 +84,7 @@ namespace BizHawk.Client.EmuHawk PadBox.Controls.Add(new VirtualPadAnalogStick { Name = button.Name, - SecondaryName = button.SecondaryNames.Any() ? button.SecondaryNames[0] : "", + SecondaryName = (button.SecondaryNames != null && button.SecondaryNames.Any()) ? button.SecondaryNames[0] : "", Location = UIHelper.Scale(button.Location), Size = UIHelper.Scale(new Size(180 + 79, 200 + 9)), RangeX = new float[] { button.MinValue, button.MidValue, button.MaxValue },