mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-16 19:21:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request from EmptyChaos/tas-sticky

Browse Source 
TASInputDlg: Fix inputs "sticking" after closing (Issue 9748)
This commit is contained in:
Markus Wick 2016-08-22 16:27:24 +02:00 committed by GitHub
commit 3156e8590b
1 changed files with 5 additions and 15 deletions

20
Source/Core/DolphinWX/TASInputDlg.cpp

@ -506,6 +506,7 @@ void TASInputDlg::ResetValues()
if (button != nullptr) if (button != nullptr)
{ {
button->value = false; button->value = false;
button->is_checked = false;
button->checkbox->SetValue(false); button->checkbox->SetValue(false);
} }
} }
@ -524,6 +525,7 @@ void TASInputDlg::ResetValues()
for (Button& button : m_cc_buttons) for (Button& button : m_cc_buttons)
{ {
button.value = false; button.value = false;
button.is_checked = false;
button.checkbox->SetValue(false); button.checkbox->SetValue(false);
} }
@ -1069,21 +1071,8 @@ void TASInputDlg::OnMouseDownL(wxMouseEvent& event)
void TASInputDlg::SetTurbo(wxMouseEvent& event) void TASInputDlg::SetTurbo(wxMouseEvent& event)
{ {
Button* button = nullptr; auto cbox = static_cast<wxCheckBox*>(event.GetEventObject());
auto button = static_cast<Button*>(cbox->GetClientData());
for (Button* const btn : m_buttons)
{
if (btn != nullptr && event.GetId() == btn->id)
button = btn;
}
if (m_ext == 2)
{
for (size_t i = 0; i < ArraySize(m_cc_buttons); ++i)
{
if (event.GetId() == m_cc_buttons[i].id)
button = &m_cc_buttons[i];
}
}
if (event.LeftDown()) if (event.LeftDown())
{ {
@ -1097,6 +1086,7 @@ void TASInputDlg::SetTurbo(wxMouseEvent& event)
if (button) if (button)
{ {
button->checkbox->SetValue(true); button->checkbox->SetValue(true);
button->is_checked = true;
button->turbo_on = !button->turbo_on; button->turbo_on = !button->turbo_on;
} }