Merge pull request #1499 from lioncash/scope

TASInputDlg: Narrow a variable scope in UpdateFromText
This commit is contained in:
Lioncash 2014-11-05 16:27:07 -05:00
commit be386e974b
1 changed files with 1 additions and 2 deletions

View File

@ -667,7 +667,6 @@ void TASInputDlg::UpdateFromSliders(wxCommandEvent& event)
void TASInputDlg::UpdateFromText(wxCommandEvent& event) void TASInputDlg::UpdateFromText(wxCommandEvent& event)
{ {
int v;
unsigned long value; unsigned long value;
if (!((wxTextCtrl*) event.GetEventObject())->GetValue().ToULong(&value)) if (!((wxTextCtrl*) event.GetEventObject())->GetValue().ToULong(&value))
@ -677,7 +676,7 @@ void TASInputDlg::UpdateFromText(wxCommandEvent& event)
{ {
if (m_controls[i] != nullptr && event.GetId() == m_controls[i]->text_id) if (m_controls[i] != nullptr && event.GetId() == m_controls[i]->text_id)
{ {
v = value > m_controls[i]->range ? m_controls[i]->range : value; int v = value > m_controls[i]->range ? m_controls[i]->range : value;
m_controls[i]->slider->SetValue(v); m_controls[i]->slider->SetValue(v);
m_controls[i]->value = v; m_controls[i]->value = v;
} }