empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Input: Fixed crash in config dialog caused by localization changes

Browse source
This commit is contained in:
Souryo 2016-02-21 23:02:42 -05:00
parent 0f7ca80aec
commit 8743f11ba9
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
GUI.NET/Config/InputInfo.cs
View file

@ -106,6 +106,12 @@ namespace Mesen.GUI.Config
public InteropEmu.ExpansionPortDevice ExpansionPortDevice = InteropEmu.ExpansionPortDevice.None;
public bool UseFourScore = false;
[NonSerialized]
public InteropEmu.ControllerType ControllerType1;
public InteropEmu.ControllerType ControllerType2;
public InteropEmu.ControllerType ControllerType3;
public InteropEmu.ControllerType ControllerType4;
public List<ControllerInfo> Controllers = new List<ControllerInfo>();
public void InitializeDefaults()

19
GUI.NET/Forms/Config/frmInputConfig.cs
View file

@ -22,6 +22,11 @@ namespace Mesen.GUI.Forms.Config
AddBinding("ExpansionPortDevice", cboExpansionPort);
AddBinding("ConsoleType", cboConsoleType);
AddBinding("UseFourScore", chkFourScore);
AddBinding("ControllerType1", cboPlayer1);
AddBinding("ControllerType2", cboPlayer2);
AddBinding("ControllerType3", cboPlayer3);
AddBinding("ControllerType4", cboPlayer4);
}
protected override void AfterUpdateUI()
@ -29,12 +34,6 @@ namespace Mesen.GUI.Forms.Config
base.AfterUpdateUI();
this.UpdateInterface();
InputInfo inputInfo = (InputInfo)Entity;
cboPlayer1.SelectedItem = ResourceHelper.GetEnumText(inputInfo.Controllers[0].ControllerType);
cboPlayer2.SelectedItem = ResourceHelper.GetEnumText(inputInfo.Controllers[1].ControllerType);
cboPlayer3.SelectedItem = ResourceHelper.GetEnumText(inputInfo.Controllers[2].ControllerType);
cboPlayer4.SelectedItem = ResourceHelper.GetEnumText(inputInfo.Controllers[3].ControllerType);
}
private void UpdateAvailableControllerTypes()
@ -73,10 +72,10 @@ namespace Mesen.GUI.Forms.Config
{
InputInfo inputInfo = (InputInfo)Entity;
inputInfo.Controllers[0].ControllerType = (InteropEmu.ControllerType)Enum.Parse(typeof(InteropEmu.ControllerType), cboPlayer1.SelectedItem.ToString());
inputInfo.Controllers[1].ControllerType = (InteropEmu.ControllerType)Enum.Parse(typeof(InteropEmu.ControllerType), cboPlayer2.SelectedItem.ToString());
inputInfo.Controllers[2].ControllerType = (InteropEmu.ControllerType)Enum.Parse(typeof(InteropEmu.ControllerType), cboPlayer3.SelectedItem.ToString());
inputInfo.Controllers[3].ControllerType = (InteropEmu.ControllerType)Enum.Parse(typeof(InteropEmu.ControllerType), cboPlayer4.SelectedItem.ToString());
inputInfo.Controllers[0].ControllerType = inputInfo.ControllerType1;
inputInfo.Controllers[1].ControllerType = inputInfo.ControllerType2;
inputInfo.Controllers[2].ControllerType = inputInfo.ControllerType3;
inputInfo.Controllers[3].ControllerType = inputInfo.ControllerType4;
InputInfo.ApplyConfig();
}