diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-01-02 09:12:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-02 09:14:33 +0300 |
| commit | bf169d6ca606bfb99ffa9cc831c73d2c4bdeda05 (patch) | |
| tree | 27d1072d0f19cba45677154896497344f9ded955 | |
| parent | fdddd4ed66f548bfcc12411705af916b726cc1a7 (diff) | |
Fix T43066: Joystick broken in GE since 2.73rc
Caused by move to SDL2, fix thanks to jensverwiebe.
| -rw-r--r-- | source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp | 6 |
1 files changed, 1 insertions, 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 */ } } |