Clean up code for multiple GameCube Controllers

Conflicts:

	Source/Core/DolphinWX/Src/Frame.cpp
	Source/Core/DolphinWX/Src/FrameTools.cpp

1 files changed, 10 insertions, 23 deletions

diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index 70b0a26f59..5409e98f6a 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -647,29 +647,16 @@ void CFrame::OnRecordReadOnly(wxCommandEvent& event)
 
 void CFrame::OnTASInput(wxCommandEvent& event)
 {
-    if(SConfig::GetInstance().m_SIDevice[0] == SIDEVICE_GC_CONTROLLER)
-    {
-        g_TASInputDlg->Show(true);
-        g_TASInputDlg->SetTitle("TAS Input - Controller 1");
-    }
-    
-    if(SConfig::GetInstance().m_SIDevice[1] == SIDEVICE_GC_CONTROLLER)
-    {
-        g_TASInputDlg1->Show(true);
-        g_TASInputDlg1->SetTitle("TAS Input - Controller 2");
-    }
-        
-    if(SConfig::GetInstance().m_SIDevice[2] == SIDEVICE_GC_CONTROLLER)
-    {
-        g_TASInputDlg2->Show(true);
-        g_TASInputDlg2->SetTitle("TAS Input - Controller 3");
-    }
-    
-    if(SConfig::GetInstance().m_SIDevice[3] == SIDEVICE_GC_CONTROLLER)
-    {
-        g_TASInputDlg3->Show(true);
-        g_TASInputDlg3->SetTitle("TAS Input - Controller 4");
-    }
+	std::string number[4] = {"1","2","3","4"};
+
+	for(int i = 0; i < 4; i++)
+	{
+		if(SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER)
+		{
+			g_TASInputDlg[i]->Show(true);
+			g_TASInputDlg[i]->SetTitle("TAS Input - Controller " + number[i]);
+		}
+	}
 }
 
 void CFrame::OnTogglePauseMovie(wxCommandEvent& WXUNUSED (event))