kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T43066: Joystick broken in GE since 2.73rc

Browse Source 
Caused by move to SDL2, fix thanks to jensverwiebe.
This commit is contained in:
Campbell Barton 2015-01-02 17:12:39 +11:00
parent fdddd4ed66
commit bf169d6ca6
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
View File

@ -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 */
}
}