Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed crash in the Linux implementation of Joystick, when inotify failed to initialize

Browse Source
This commit is contained in:
Laurent Gomila 2013-08-15 23:15:11 +02:00
parent 5173f51d52
commit c6767d0af1
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/SFML/Window/Linux/JoystickImpl.cpp
View File

@ -53,12 +53,19 @@ namespace
bool canRead(int descriptor) bool canRead(int descriptor)
{ {
fd_set set; if (descriptor >= 0)
FD_ZERO(&set); {
FD_SET(descriptor, &set); fd_set set;
timeval timeout = {0, 0}; FD_ZERO(&set);
return select(descriptor + 1, &set, NULL, NULL, &timeout) > 0 && FD_SET(descriptor, &set);
FD_ISSET(notifyFd, &set); timeval timeout = {0, 0};
return select(descriptor + 1, &set, NULL, NULL, &timeout) > 0 &&
FD_ISSET(notifyFd, &set);
}
else
{
return false;
}
} }
} }
@ -102,7 +109,7 @@ void JoystickImpl::cleanup()
inotify_rm_watch(notifyFd, inputFd); inotify_rm_watch(notifyFd, inputFd);
// Close the inotify file descriptor // Close the inotify file descriptor
if (inputFd >= 0) if (notifyFd >= 0)
::close(notifyFd); ::close(notifyFd);
} }
@ -120,7 +127,7 @@ bool JoystickImpl::isConnected(unsigned int index)
while (canRead(notifyFd)) while (canRead(notifyFd))
{ {
char buffer[128]; char buffer[128];
read(notifyFd, buffer, sizeof(buffer)); (void)read(notifyFd, buffer, sizeof(buffer));
} }
} }