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

Possible control flow clarification.

Browse Source
This commit is contained in:
Camilla Berglund 2014-11-04 21:23:13 +01:00
parent 382133b384
commit 899117e785
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/linux_joystick.c
View File

@ -93,7 +93,6 @@ static void pollJoystickEvents(void)
{ {
#ifdef __linux__ #ifdef __linux__
int i; int i;
ssize_t result;
struct js_event e; struct js_event e;
for (i = 0; i <= GLFW_JOYSTICK_LAST; i++) for (i = 0; i <= GLFW_JOYSTICK_LAST; i++)
@ -105,19 +104,21 @@ static void pollJoystickEvents(void)
for (;;) for (;;)
{ {
errno = 0; errno = 0;
result = read(_glfw.linux_js[i].fd, &e, sizeof(e)); if (read(_glfw.linux_js[i].fd, &e, sizeof(e)) < 0)
if (errno == ENODEV)
{ {
free(_glfw.linux_js[i].axes); if (errno == ENODEV)
free(_glfw.linux_js[i].buttons); {
free(_glfw.linux_js[i].name); // The joystick was disconnected
memset(&_glfw.linux_js[i], 0, sizeof(_glfw.linux_js[i])); free(_glfw.linux_js[i].axes);
} free(_glfw.linux_js[i].buttons);
free(_glfw.linux_js[i].name);
memset(&_glfw.linux_js[i], 0, sizeof(_glfw.linux_js[i]));
}
if (result == -1)
break; break;
}
// We don't care if it's an init event or not // We don't care if it's an init event or not
e.type &= ~JS_EVENT_INIT; e.type &= ~JS_EVENT_INIT;