mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 13:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 0a19ea0a3e into b35641f4a3

Browse Source
This commit is contained in:
Yang sheng 2024-05-27 12:51:49 +08:00 committed by GitHub
commit e0c68348f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/linux_joystick.c
View File

@ -386,6 +386,7 @@ void _glfwTerminateJoysticksLinux(void)
GLFWbool _glfwPollJoystickLinux(_GLFWjoystick* js, int mode) GLFWbool _glfwPollJoystickLinux(_GLFWjoystick* js, int mode)
{ {
// Read all queued events (non-blocking) // Read all queued events (non-blocking)
GLFWbool event_valid = GLFW_FALSE;
for (;;) for (;;)
{ {
struct input_event e; struct input_event e;
@ -396,6 +397,8 @@ GLFWbool _glfwPollJoystickLinux(_GLFWjoystick* js, int mode)
// Reset the joystick slot if the device was disconnected // Reset the joystick slot if the device was disconnected
if (errno == ENODEV) if (errno == ENODEV)
closeJoystick(js); closeJoystick(js);
else if ((errno == EAGAIN) && (mode != _GLFW_POLL_PRESENCE))
return event_valid;
break; break;
} }
@ -407,6 +410,7 @@ GLFWbool _glfwPollJoystickLinux(_GLFWjoystick* js, int mode)
else if (e.code == SYN_REPORT) else if (e.code == SYN_REPORT)
{ {
_glfw.linjs.dropped = GLFW_FALSE; _glfw.linjs.dropped = GLFW_FALSE;
event_valid = GLFW_TRUE;
pollAbsState(js); pollAbsState(js);
} }
} }