ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-23 11:05:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OpenTK] Protect against invalid axis/button ids

Browse source
This commit is contained in:
thefiddler 2014-01-15 01:24:20 +01:00
parent e6a9adf494
commit 44e2576c86
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Source/OpenTK/Input/JoystickDevice.cs
View file

@ -130,22 +130,28 @@ namespace OpenTK.Input
internal void SetAxis(JoystickAxis axis, float @value) internal void SetAxis(JoystickAxis axis, float @value)
{ {
move_args.Axis = axis; if ((int)axis < axis_collection.Count)
move_args.Delta = move_args.Value - @value; {
axis_collection[axis] = move_args.Value = @value; move_args.Axis = axis;
Move(this, move_args); move_args.Delta = move_args.Value - @value;
axis_collection[axis] = move_args.Value = @value;
Move(this, move_args);
}
} }
internal void SetButton(JoystickButton button, bool @value) internal void SetButton(JoystickButton button, bool @value)
{ {
if (button_collection[button] != @value) if ((int)button < button_collection.Count)
{ {
button_args.Button = button; if (button_collection[button] != @value)
button_collection[button] = button_args.Pressed = @value; {
if (@value) button_args.Button = button;
ButtonDown(this, button_args); button_collection[button] = button_args.Pressed = @value;
else if (@value)
ButtonUp(this, button_args); ButtonDown(this, button_args);
else
ButtonUp(this, button_args);
}
} }
} }