From 76340abfa2e04672116f0d1ddcac04fa3317587e Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Thu, 7 Mar 2013 15:37:08 -0800
Subject: [PATCH] Load the game controller mapping hint when opening a game
 controller.

---
 src/joystick/SDL_gamecontroller.c | 62 ++++++++++++++++---------------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/src/joystick/SDL_gamecontroller.c b/src/joystick/SDL_gamecontroller.c
index 585e955cc..90fb7b903 100644
--- a/src/joystick/SDL_gamecontroller.c
+++ b/src/joystick/SDL_gamecontroller.c
@@ -762,6 +762,33 @@ SDL_GameControllerMapping( SDL_GameController * gamecontroller )
 	return SDL_GameControllerMappingForGUID( gamecontroller->mapping.guid );
 }
 
+static void
+SDL_GameControllerLoadHints()
+{
+    const char *hint = SDL_GetHint(SDL_HINT_GAMECONTROLLERCONFIG);
+    if ( hint && hint[0] ) {
+        int nchHints = SDL_strlen( hint );
+        char *pUserMappings = SDL_malloc( nchHints + 1 );
+        char *pTempMappings = pUserMappings;
+        SDL_memcpy( pUserMappings, hint, nchHints );
+        while ( pUserMappings ) {
+            char *pchNewLine = NULL;
+
+            pchNewLine = SDL_strchr( pUserMappings, '\n' );
+            if ( pchNewLine )
+                *pchNewLine = '\0';
+
+            SDL_GameControllerAddMapping( pUserMappings );
+
+            if ( pchNewLine )
+                pUserMappings = pchNewLine + 1;
+            else
+                pUserMappings = NULL;
+        }
+        SDL_free(pTempMappings);
+    }
+}
+
 /*
  * Initialize the game controller system, mostly load our DB of controller config mappings
  */
@@ -781,35 +808,11 @@ SDL_GameControllerInit(void)
 	}
 
 	// load in any user supplied config
-	{
-		const char *hint = SDL_GetHint(SDL_HINT_GAMECONTROLLERCONFIG);
-		if ( hint && hint[0] )
-		{
-			int nchHints = SDL_strlen( hint );
-			char *pUserMappings = SDL_malloc( nchHints + 1 );
-			char *pTempMappings = pUserMappings;
-			SDL_memcpy( pUserMappings, hint, nchHints );
-			while ( pUserMappings )
-			{
-				char *pchNewLine = NULL;
-
-				pchNewLine = SDL_strchr( pUserMappings, '\n' );
-				if ( pchNewLine )
-					*pchNewLine = '\0';
-
-				SDL_GameControllerAddMapping( pUserMappings );
-
-				if ( pchNewLine )
-					pUserMappings = pchNewLine + 1;
-				else
-					pUserMappings = NULL;
-			}
-			SDL_free(pTempMappings);
-		}
-	}
+    SDL_GameControllerLoadHints();
 
 	/* watch for joy events and fire controller ones if needed */
 	SDL_AddEventWatch( SDL_GameControllerEventWatcher, NULL );
+
 	return (0);
 }
 
@@ -875,10 +878,11 @@ SDL_GameControllerOpen(int device_index)
 		gamecontrollerlist = gamecontrollerlist->next;
     }
 
-	// 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);
-	if ( !pSupportedController )
-	{
+	if ( !pSupportedController ) {
 		SDL_SetError("Couldn't find mapping for device (%d)", device_index );
 		return (NULL);
 	}