pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't re-read the hints when opening the game controller. Instead use SDL_GameControllerAddMapping() to add hints after initialization.

Browse source
This commit is contained in:
Sam Lantinga 2013-03-08 10:09:51 -08:00
parent 3f118b42fe
commit 7f2340dc6a
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/SDL_hints.h
View file

@ -209,6 +209,9 @@ extern "C" {
* \brief A variable that lets you manually hint extra gamecontroller db entries * \brief A variable that lets you manually hint extra gamecontroller db entries
* *
* The variable expected newline delimited rows of gamecontroller config data, see SDL_gamecontroller.h * The variable expected newline delimited rows of gamecontroller config data, see SDL_gamecontroller.h
*
* This hint must be set before calling SDL_Init(SDL_INIT_GAMECONTROLLER)
* You can update hints after the system is initialized with SDL_GameControllerAddMapping()
*/ */
#define SDL_HINT_GAMECONTROLLERCONFIG "SDL_GAMECONTROLLERCONFIG" #define SDL_HINT_GAMECONTROLLERCONFIG "SDL_GAMECONTROLLERCONFIG"

2
src/joystick/SDL_gamecontroller.c
View file

@ -879,8 +879,6 @@ SDL_GameControllerOpen(int device_index)
} }
// Find a controller mapping // Find a controller mapping
// Check for hints in case someone has changed them recently
SDL_GameControllerLoadHints();
pSupportedController = SDL_PrivateGetControllerMapping(device_index); pSupportedController = SDL_PrivateGetControllerMapping(device_index);
if ( !pSupportedController ) { if ( !pSupportedController ) {
SDL_SetError("Couldn't find mapping for device (%d)", device_index ); SDL_SetError("Couldn't find mapping for device (%d)", device_index );