Linux joystick fixes.

This commit is contained in:
Camilla Berglund 2012-09-07 01:01:17 +02:00
parent 755c2a364b
commit 8cf093a19d

View File

@ -53,7 +53,7 @@ static int openJoystickDevice(int joy, const char* path)
char numAxes, numButtons; char numAxes, numButtons;
int fd, version; int fd, version;
fd = open(path, O_NONBLOCK); fd = open(path, O_RDONLY | O_NONBLOCK);
if (fd == -1) if (fd == -1)
return GL_FALSE; return GL_FALSE;
@ -127,7 +127,7 @@ static void pollJoystickEvents(void)
if (errno == ENODEV) if (errno == ENODEV)
_glfwLibrary.X11.joystick[i].present = GL_FALSE; _glfwLibrary.X11.joystick[i].present = GL_FALSE;
if (result < sizeof(e)) 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