From 46d31796df3e6aac3ce965262a779f6f715553b9 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Tue, 21 Apr 2015 20:35:35 -0700
Subject: [PATCH] Qt: Fix controllers sometimes not loading the right profile

---
 CHANGES                             | 1 +
 src/platform/qt/InputController.cpp | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGES b/CHANGES
index 881bfb7d6..14837a502 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,7 @@ Bugfixes:
  - Qt: Fix controller axis querying
  - GBA Memory: Fix 32-bit loads from unaddress cartridge space
  - Qt: Fix multiplayer windows opening as the wrong size
+ - Qt: Fix controllers sometimes not loading the right profile
 Misc:
  - Qt: Show multiplayer numbers in window title
  - Qt: Solar sensor can have shortcuts set
diff --git a/src/platform/qt/InputController.cpp b/src/platform/qt/InputController.cpp
index 9b36fd24c..ac8e581a9 100644
--- a/src/platform/qt/InputController.cpp
+++ b/src/platform/qt/InputController.cpp
@@ -90,6 +90,11 @@ void InputController::setConfiguration(ConfigController* config) {
 
 void InputController::loadConfiguration(uint32_t type) {
 	GBAInputMapLoad(&m_inputMap, type, m_config->input());
+#ifdef BUILD_SDL
+	if (m_playerAttached) {
+		GBASDLPlayerLoadConfig(&m_sdlPlayer, m_config->input());
+	}
+#endif
 }
 
 void InputController::loadProfile(uint32_t type, const QString& profile) {