ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert use of new input config dialog

This commit is contained in:
adelikat 2012-08-13 03:17:47 +00:00
parent aa2475806a
commit d8a21d18ff
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

@ -392,26 +392,13 @@ namespace BizHawk.MultiClient
private void controllersToolStripMenuItem_Click(object sender, EventArgs e) private void controllersToolStripMenuItem_Click(object sender, EventArgs e)
{ {
if (!INTERIM) InputConfig i = new InputConfig();
i.ShowDialog();
//re-initialize controls in case anything was changed
if (i.DialogResult == DialogResult.OK)
{ {
InputConfig i = new InputConfig(); InitControls();
i.ShowDialog(); SyncControls();
//re-initialize controls in case anything was changed
if (i.DialogResult == DialogResult.OK)
{
InitControls();
SyncControls();
}
}
else
{
ControllerConfig c = new ControllerConfig();
c.ShowDialog();
if (c.DialogResult == DialogResult.OK)
{
InitControls();
SyncControls();
}
} }
} }