From 7efd9fd56c353c597528ad6c05f53a219a24d46d Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 4 Jul 2015 03:52:40 -0400 Subject: [PATCH] Merge pull request #2696 from RisingFog/tasinput Fix random hangs when loading savestates with TAS Input --- Source/Core/DolphinWX/TASInputDlg.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/TASInputDlg.cpp b/Source/Core/DolphinWX/TASInputDlg.cpp index c921be7497..8896a8bb02 100644 --- a/Source/Core/DolphinWX/TASInputDlg.cpp +++ b/Source/Core/DolphinWX/TASInputDlg.cpp @@ -776,8 +776,8 @@ void TASInputDlg::GetValues(GCPadStatus* PadStatus) PadStatus->stickY = m_main_stick.y_cont.value; PadStatus->substickX = m_c_stick.x_cont.value; PadStatus->substickY = m_c_stick.y_cont.value; - PadStatus->triggerLeft = m_l.checkbox->GetValue() ? 255 : m_l_cont.slider->GetValue(); - PadStatus->triggerRight = m_r.checkbox->GetValue() ? 255 : m_r_cont.slider->GetValue(); + PadStatus->triggerLeft = m_l.checkbox->GetValue() ? 255 : m_l_cont.value; + PadStatus->triggerRight = m_r.checkbox->GetValue() ? 255 : m_r_cont.value; for (unsigned int i = 0; i < ArraySize(m_buttons); ++i) {