From 49dc9cbfa0b7321805c6f80332384c9a89841b54 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Thu, 8 Nov 2012 04:46:48 +0000
Subject: [PATCH] only load ControllerConfig dialog, remove option for old
 input config

---
 BizHawk.MultiClient/MainForm.MenuItems.cs | 25 ++++++-----------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs
index cc37e57c70..2d3b56503c 100644
--- a/BizHawk.MultiClient/MainForm.MenuItems.cs
+++ b/BizHawk.MultiClient/MainForm.MenuItems.cs
@@ -412,26 +412,13 @@ namespace BizHawk.MultiClient
 
 		private void controllersToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			if (true)
+			
+			ControllerConfig c = new ControllerConfig();
+			c.ShowDialog();
+			if (c.DialogResult == DialogResult.OK)
 			{
-				ControllerConfig c = new ControllerConfig();
-				c.ShowDialog();
-				if (c.DialogResult == DialogResult.OK)
-				{
-					InitControls();
-					SyncControls();
-				}
-			}
-			else
-			{
-				InputConfig i = new InputConfig();
-				i.ShowDialog();
-				//re-initialize controls in case anything was changed
-				if (i.DialogResult == DialogResult.OK)
-				{
-					InitControls();
-					SyncControls();
-				}
+				InitControls();
+				SyncControls();
 			}
 		}