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

Fix another crash in tas input.

This commit is contained in:
Rachel Bryk 2014-10-08 09:46:28 -04:00
parent 2423b9b2bd
commit 2cfc1eac51
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,7 +169,6 @@ void TASInputDlg::CreateGCLayout()
{ {
if (hasLayout) if (hasLayout)
return; return;
hasLayout = true;
Buttons[6] = &X; Buttons[6] = &X;
Buttons[7] = &Y; Buttons[7] = &Y;
@ -250,6 +249,8 @@ void TASInputDlg::CreateGCLayout()
main_szr->Add(bottom_box); main_szr->Add(bottom_box);
SetSizerAndFit(main_szr); SetSizerAndFit(main_szr);
ResetValues(); ResetValues();
hasLayout = true;
} }
@ -620,6 +621,8 @@ void TASInputDlg::OnCloseWindow(wxCloseEvent& event)
bool TASInputDlg::TASHasFocus() bool TASInputDlg::TASHasFocus()
{ {
if (!hasLayout)
return false;
//allows numbers to be used as hotkeys //allows numbers to be used as hotkeys
for (unsigned int i = 0; i < 10; ++i) for (unsigned int i = 0; i < 10; ++i)
{ {