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 #2696 from RisingFog/tasinput 

Fix random hangs when loading savestates with TAS Input
This commit is contained in:
Lioncash 2015-07-04 03:52:40 -04:00
parent ced30899cc 10f50f33fb
commit eb3c5a240f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -776,8 +776,8 @@ void TASInputDlg::GetValues(GCPadStatus* PadStatus)
PadStatus->stickY = m_main_stick.y_cont.value; PadStatus->stickY = m_main_stick.y_cont.value;
PadStatus->substickX = m_c_stick.x_cont.value; PadStatus->substickX = m_c_stick.x_cont.value;
PadStatus->substickY = m_c_stick.y_cont.value; PadStatus->substickY = m_c_stick.y_cont.value;
PadStatus->triggerLeft = m_l.checkbox->GetValue() ? 255 : m_l_cont.slider->GetValue(); PadStatus->triggerLeft = m_l.checkbox->GetValue() ? 255 : m_l_cont.value;
PadStatus->triggerRight = m_r.checkbox->GetValue() ? 255 : m_r_cont.slider->GetValue(); PadStatus->triggerRight = m_r.checkbox->GetValue() ? 255 : m_r_cont.value;
for (unsigned int i = 0; i < ArraySize(m_buttons); ++i) for (unsigned int i = 0; i < ArraySize(m_buttons); ++i)
{ {