From a0a3ac191aa4e016fae1cb40672833f83b58a9a5 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sat, 18 Apr 2015 01:10:50 -0700
Subject: [PATCH] Qt: Recalibrate axes in more places

---
 src/platform/qt/GBAKeyEditor.cpp    | 1 -
 src/platform/qt/GameController.cpp  | 4 ++++
 src/platform/qt/InputController.cpp | 3 +++
 src/platform/qt/Window.cpp          | 3 +++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/platform/qt/GBAKeyEditor.cpp b/src/platform/qt/GBAKeyEditor.cpp
index 66a9160b3..47037991e 100644
--- a/src/platform/qt/GBAKeyEditor.cpp
+++ b/src/platform/qt/GBAKeyEditor.cpp
@@ -62,7 +62,6 @@ GBAKeyEditor::GBAKeyEditor(InputController* controller, int type, const QString&
 			m_controller->setGamepad(m_type, i);
 			m_profile = m_profileSelect->currentText();
 			m_controller->loadProfile(m_type, m_profile);
-			m_controller->recalibrateAxes();
 			refresh();
 		});
 	}
diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp
index b8a98cdcc..adc95ab0c 100644
--- a/src/platform/qt/GameController.cpp
+++ b/src/platform/qt/GameController.cpp
@@ -273,6 +273,10 @@ void GameController::openGame() {
 		m_threadContext.patch = VFileOpen(m_patch.toLocal8Bit().constData(), O_RDONLY);
 	}
 
+#ifdef BUILD_SDL
+	m_inputController->recalibrateAxes();
+#endif
+
 	if (!GBAThreadStart(&m_threadContext)) {
 		m_gameOpen = false;
 		emit gameFailed();
diff --git a/src/platform/qt/InputController.cpp b/src/platform/qt/InputController.cpp
index c8e96e2c6..125c92084 100644
--- a/src/platform/qt/InputController.cpp
+++ b/src/platform/qt/InputController.cpp
@@ -94,6 +94,9 @@ void InputController::loadConfiguration(uint32_t type) {
 
 void InputController::loadProfile(uint32_t type, const QString& profile) {
 	GBAInputProfileLoad(&m_inputMap, type, m_config->input(), profile.toLocal8Bit().constData());
+#ifdef BUILD_SDL
+	recalibrateAxes();
+#endif
 }
 
 void InputController::saveConfiguration(uint32_t type) {
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index 46178cb02..60b9fb02c 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -298,6 +298,9 @@ void Window::openSettingsWindow() {
 }
 
 void Window::openShortcutWindow() {
+#ifdef BUILD_SDL
+	m_inputController.recalibrateAxes();
+#endif
 	ShortcutView* shortcutView = new ShortcutView();
 	shortcutView->setController(m_shortcutController);
 	openView(shortcutView);