From 00f1229ea222fad9e3266d3e63b60a59d7d58c85 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Fri, 2 Jul 2021 03:19:53 -0700
Subject: [PATCH] Qt: Fix merge issue

---
 src/platform/qt/input/InputController.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/platform/qt/input/InputController.cpp b/src/platform/qt/input/InputController.cpp
index 318bd79c9..27d45b371 100644
--- a/src/platform/qt/input/InputController.cpp
+++ b/src/platform/qt/input/InputController.cpp
@@ -159,8 +159,9 @@ void InputController::setPlatform(mPlatform platform) {
 
 	loadConfiguration(KEYBOARD);
 #ifdef BUILD_SDL
-	mSDLInitBindingsGBA(&m_inputMap);
-	loadConfiguration(SDL_BINDING_BUTTON);
+	if (!loadConfiguration(SDL_BINDING_BUTTON)) {
+		mSDLInitBindingsGBA(&m_inputMap);
+	}
 #endif
 
 	rebuildKeyIndex();
@@ -273,9 +274,6 @@ void InputController::setConfiguration(ConfigController* config) {
 	if (!m_playerAttached) {
 		m_playerAttached = mSDLAttachPlayer(&s_sdlEvents, &m_sdlPlayer);
 	}
-	if (!loadConfiguration(SDL_BINDING_BUTTON)) {
-		mSDLInitBindingsGBA(&m_inputMap);
-	}
 	loadProfile(SDL_BINDING_BUTTON, profileForType(SDL_BINDING_BUTTON));
 #endif
 	restoreModel();