From d8a21d18ff164ea7ac630aa70ae5ea0f0ad8deaf Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Mon, 13 Aug 2012 03:17:47 +0000
Subject: [PATCH] Revert use of new input config dialog

---
 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 2e216f42ff..897bc94919 100644
--- a/BizHawk.MultiClient/MainForm.MenuItems.cs
+++ b/BizHawk.MultiClient/MainForm.MenuItems.cs
@@ -392,26 +392,13 @@ namespace BizHawk.MultiClient
 
 		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();
-				i.ShowDialog();
-				//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();
-				}
+				InitControls();
+				SyncControls();
 			}
 		}