FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'svn/trunk' into git_master

Browse Source
This commit is contained in:
Diederick C. Niehorster 2019-09-11 21:22:18 +02:00
commit 727f44411a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
freeglut/freeglut/src/x11/fg_joystick_x11.c
View File

@ -599,12 +599,12 @@ void fgPlatformJoystickOpen( SFG_Joystick* joy )
* to the upper byte of an uninitialized word doesn't work.
* 9 April 2003
*/
ioctl( joy->pJoystick.fd, JSIOCGAXES, &u );
joy->num_axes = u;
ioctl( joy->pJoystick.fd, JSIOCGBUTTONS, &u );
joy->num_buttons = u;
if(ioctl(joy->pJoystick.fd, JSIOCGAXES, &u) != -1)
joy->num_axes = u;
if(ioctl(joy->pJoystick.fd, JSIOCGBUTTONS, &u) != -1)
joy->num_buttons = u;
ioctl( joy->pJoystick.fd, JSIOCGNAME( sizeof( joy->name ) ), joy->name );
fcntl( joy->pJoystick.fd, F_SETFL, O_NONBLOCK );
fcntl(joy->pJoystick.fd, F_SETFL, fcntl(joy->pJoystick.fd, F_GETFL) | O_NONBLOCK);
# endif
/*