diff options
| author | Rachel Bryk <RachelBryk@gmail.com> | 2013-07-23 20:44:21 -0400 |
|---|---|---|
| committer | Rachel Bryk <RachelBryk@gmail.com> | 2013-07-23 20:44:21 -0400 |
| commit | 7a6eeb5fbd5de1a65aae04ebc7be0b9ea400a337 (patch) | |
| tree | c9c6ef31df44362842639add44f1476f443b5968 /Source/Core/DolphinWX/Src/FrameTools.cpp | |
| parent | 8a4b6f3d73944d84df5c1ae70ec3d331c6f78009 (diff) | |
| parent | 3f03588decc18ddb4441cd6480eb36885eae7f8a (diff) | |
Merge branch 'multi-tas-input'
Diffstat (limited to 'Source/Core/DolphinWX/Src/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/FrameTools.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 27a1aaa097..1c70b4e715 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -647,7 +647,16 @@ void CFrame::OnRecordReadOnly(wxCommandEvent& event) void CFrame::OnTASInput(wxCommandEvent& event) { - g_TASInputDlg->Show(true); + std::string number[4] = {"1","2","3","4"}; + + for (int i = 0; i < 4; ++i) + { + if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER || SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA) + { + g_TASInputDlg[i]->Show(true); + g_TASInputDlg[i]->SetTitle("TAS Input - Controller " + number[i]); + } + } } void CFrame::OnTogglePauseMovie(wxCommandEvent& WXUNUSED (event)) |