mirror of
git://projects.qi-hardware.com/gmenu2x.git
synced 2024-11-22 13:05:20 +02:00
Make sure the joystick subsystem is inited before InputManager starts
This commit is contained in:
parent
fcb2618286
commit
de9b3cd27d
@ -221,7 +221,7 @@ GMenu2X::GMenu2X()
|
||||
setenv("SDL_FBCON_DONT_CLEAR", "1", 0);
|
||||
|
||||
//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());
|
||||
quit();
|
||||
}
|
||||
|
@ -42,8 +42,15 @@ InputManager::InputManager()
|
||||
{
|
||||
#ifndef SDL_JOYSTICK_DISABLED
|
||||
int i;
|
||||
|
||||
if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0) {
|
||||
ERROR("Unable to init joystick subsystem\n");
|
||||
return;
|
||||
}
|
||||
|
||||
for (i = 0; i < SDL_NumJoysticks(); i++)
|
||||
joysticks.push_back(SDL_JoystickOpen(i));
|
||||
DEBUG("Opening %i joysticks\n", i);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user