From bf169d6ca606bfb99ffa9cc831c73d2c4bdeda05 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 2 Jan 2015 17:12:39 +1100 Subject: Fix T43066: Joystick broken in GE since 2.73rc Caused by move to SDL2, fix thanks to jensverwiebe. --- source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp index 765f0561007..e3bc409eb07 100644 --- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp +++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp @@ -111,7 +111,7 @@ SCA_Joystick *SCA_Joystick::GetInstance( short int joyindex ) char *videodriver = getenv("SDL_VIDEODRIVER"); BLI_setenv("SDL_VIDEODRIVER", "dummy"); - int success = (SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO) != -1 ); + int success = (SDL_InitSubSystem(SDL_INIT_JOYSTICK) != -1 ); BLI_setenv("SDL_VIDEODRIVER", videodriver); # endif @@ -156,11 +156,7 @@ void SCA_Joystick::ReleaseInstance() /* The video subsystem is required for joystick input to work. However, * when GHOST is running under SDL, video is freed elsewhere. * Do this once only. */ -# ifdef WITH_GHOST_SDL SDL_QuitSubSystem(SDL_INIT_JOYSTICK); -# else - SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO); -# endif #endif /* WITH_SDL */ } } -- cgit v1.2.3