OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Defer SDL subsystem initialization since it seems to cause conflicts with GUI toolkits on some systems.

Browse source
This commit is contained in:
Braden Obrzut 2015-02-02 19:36:08 -05:00
commit 8e1b1aa201
4 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/posix/sdl/i_joystick.cpp
View file

@ -1,4 +1,4 @@
#include <SDL_joystick.h>
#include <SDL.h>
#include "doomdef.h"
#include "templates.h"
@ -266,11 +266,16 @@ static SDLInputJoystickManager *JoystickManager;
void I_StartupJoysticks()
{
JoystickManager = new SDLInputJoystickManager();
if(SDL_InitSubSystem(SDL_INIT_JOYSTICK) >= 0)
JoystickManager = new SDLInputJoystickManager();
}
void I_ShutdownJoysticks()
{
delete JoystickManager;
if(JoystickManager)
{
delete JoystickManager;
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
}
}
void I_GetJoysticks(TArray<IJoystickConfig *> &sticks)