summaryrefslogtreecommitdiff
path: root/platform/windows
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-06-17 18:58:41 +0200
committerGitHub <noreply@github.com>2019-06-17 18:58:41 +0200
commit0f543ba99dd57497ac298ab387cd019ff55514b7 (patch)
tree25929a2fdf3a5af5335e8e0295c0edcf6ff4f8fe /platform/windows
parent3b3ba7d179748d3b24fe457a67254db340ff8082 (diff)
parent4014888687f3c3f3afd8f1270a3b35b500217423 (diff)
Merge pull request #29852 from georgwacker/fix-controller-hang
Fix endless controller iteration on windows
Diffstat (limited to 'platform/windows')
-rw-r--r--platform/windows/joypad_windows.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/windows/joypad_windows.cpp b/platform/windows/joypad_windows.cpp
index 432060f4fe..53ce342e8c 100644
--- a/platform/windows/joypad_windows.cpp
+++ b/platform/windows/joypad_windows.cpp
@@ -334,7 +334,7 @@ void JoypadWindows::process_joypads() {
if (joy.state.dwPacketNumber != joy.last_packet) {
int button_mask = XINPUT_GAMEPAD_DPAD_UP;
- for (int j = 0; j <= 16; i++) {
+ for (int j = 0; j <= 16; j++) {
input->joy_button(joy.id, j, joy.state.Gamepad.wButtons & button_mask);
button_mask = button_mask * 2;