qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-23 00:37:10 +02:00
Code

Make sure the joystick subsystem is inited before InputManager starts

Browse Source
This commit is contained in:
Paul Cercueil 2013-07-29 16:54:12 -04:00
parent fcb2618286
commit de9b3cd27d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gmenu2x.cpp
View File

@ -221,7 +221,7 @@ GMenu2X::GMenu2X()
setenv("SDL_FBCON_DONT_CLEAR", "1", 0); setenv("SDL_FBCON_DONT_CLEAR", "1", 0);
//Screen //Screen
if( SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_TIMER) < 0) { if( SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) < 0) {
ERROR("Could not initialize SDL: %s\n", SDL_GetError()); ERROR("Could not initialize SDL: %s\n", SDL_GetError());
quit(); quit();
} }

7
src/inputmanager.cpp
View File

@ -42,8 +42,15 @@ InputManager::InputManager()
{ {
#ifndef SDL_JOYSTICK_DISABLED #ifndef SDL_JOYSTICK_DISABLED
int i; int i;
if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0) {
ERROR("Unable to init joystick subsystem\n");
return;
}
for (i = 0; i < SDL_NumJoysticks(); i++) for (i = 0; i < SDL_NumJoysticks(); i++)
joysticks.push_back(SDL_JoystickOpen(i)); joysticks.push_back(SDL_JoystickOpen(i));
DEBUG("Opening %i joysticks\n", i);
#endif #endif
} }