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

Fixed joysticks not detected when checked at application startup.

Browse Source
This commit is contained in:
Laurent Gomila 2013-02-02 10:08:43 +01:00
parent f3d2129f9f
commit fa69228716
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SFML/Window/Win32/JoystickImpl.cpp
View File

@ -35,9 +35,10 @@ namespace
{ {
struct ConnectionCache struct ConnectionCache
{ {
ConnectionCache() : connected(false) {} ConnectionCache() : connected(false), firstTime(true) {}
bool connected; bool connected;
sf::Clock timer; sf::Clock timer;
bool firstTime;
}; };
const sf::Time connectionRefreshDelay = sf::milliseconds(500); const sf::Time connectionRefreshDelay = sf::milliseconds(500);
@ -55,9 +56,10 @@ bool JoystickImpl::isConnected(unsigned int index)
// because of a strange (buggy?) behaviour of joyGetPosEx when joysticks // because of a strange (buggy?) behaviour of joyGetPosEx when joysticks
// are just plugged/unplugged -- it takes really long and kills the app performances // are just plugged/unplugged -- it takes really long and kills the app performances
ConnectionCache& cache = connectionCache[index]; ConnectionCache& cache = connectionCache[index];
if (cache.timer.getElapsedTime() > connectionRefreshDelay) if (cache.firstTime || (cache.timer.getElapsedTime() > connectionRefreshDelay))
{ {
cache.timer.restart(); cache.timer.restart();
cache.firstTime = false;
JOYINFOEX joyInfo; JOYINFOEX joyInfo;
joyInfo.dwSize = sizeof(joyInfo); joyInfo.dwSize = sizeof(joyInfo);