summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorBraden <Bradenb95@gmail.com>2012-03-01 18:00:41 -0600
committerskidau <skidau@gmail.com>2012-05-26 13:21:30 +1000
commit82cb14e49bc4bbd463427243248a92ef1a58db3f (patch)
tree47490fdf15ac1e4b73441de8ba6b8061f68b05b7 /Source/Core
parentcbc84ecd725acc553f2a5fd945f451652e382b0d (diff)
Actually fixes crashing on start up.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinWX/Src/TASInputDlg.cpp30
1 files changed, 14 insertions, 16 deletions
diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
index 784c299498..1c2182e7d2 100644
--- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp
+++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
@@ -635,24 +635,22 @@ void TASInputDlg::UpdateFromText(wxCommandEvent& event)
{
*v = (u8) (value > 255 ? 255 : value);
slider->SetValue(*v);
-
- }
-
- if(update == 1)
- {
- if(update_axis == 1)
+
+ if(update == 1)
{
- xaxis = *v;
- static_bitmap_main->SetBitmap(TASInputDlg::CreateStickBitmap(xaxis,yaxis));
- }
+ if(update_axis == 1)
+ {
+ xaxis = *v;
+ static_bitmap_main->SetBitmap(TASInputDlg::CreateStickBitmap(xaxis,yaxis));
+ }
- if(update_axis == 2)
- {
- yaxis =256 - *v;
- static_bitmap_main->SetBitmap(TASInputDlg::CreateStickBitmap(xaxis,yaxis));
- }
+ if(update_axis == 2)
+ {
+ yaxis =256 - *v;
+ static_bitmap_main->SetBitmap(TASInputDlg::CreateStickBitmap(xaxis,yaxis));
+ }
- }
+ }
if(update == 2)
{
@@ -669,7 +667,7 @@ void TASInputDlg::UpdateFromText(wxCommandEvent& event)
}
}
-
+ }
}
void TASInputDlg::OnCloseWindow(wxCloseEvent& event)