godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #29852 from georgwacker/fix-controller-hang 

Fix endless controller iteration on windows
This commit is contained in:
Rémi Verschelde 2019-06-17 18:58:41 +02:00 committed by GitHub
parent 3b3ba7d179 4014888687
commit 0f543ba99d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/windows/joypad_windows.cpp
View File

@ -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;