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

Merge pull request #1236 from RachelBryk/fix 

Fix crash in tas input.
This commit is contained in:
skidau 2014-10-08 13:51:14 +11:00
parent 38b64fd077 e09288aec1
commit bd47477bc2
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/DolphinWX/TASInputDlg.cpp
View File

@ -93,6 +93,10 @@ void TASInputDlg::CreateWiiLayout()
Buttons[11] = nullptr; //&C; Buttons[11] = nullptr; //&C;
Buttons[12] = nullptr; //&Z; Buttons[12] = nullptr; //&Z;
Controls[2] = nullptr;
Controls[3] = nullptr;
Controls[4] = nullptr;
Controls[5] = nullptr;
Controls[6] = &xCont; Controls[6] = &xCont;
Controls[7] = &yCont; Controls[7] = &yCont;
Controls[8] = &zCont; Controls[8] = &zCont;
@ -179,6 +183,9 @@ void TASInputDlg::CreateGCLayout()
Controls[3] = &rCont; Controls[3] = &rCont;
Controls[4] = &CStick.xCont; Controls[4] = &CStick.xCont;
Controls[5] = &CStick.yCont; Controls[5] = &CStick.yCont;
Controls[6] = nullptr;
Controls[7] = nullptr;
Controls[8] = nullptr;
wxBoxSizer* const top_box = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* const top_box = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* const bottom_box = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* const bottom_box = new wxBoxSizer(wxHORIZONTAL);