From 59477207e37d4a2c40ba4f072b9e7081c5062b50 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sat, 20 Feb 2016 23:31:54 -0800
Subject: [PATCH] Qt: Fix initial state of key mapping

---
 CHANGES                          | 1 +
 src/platform/qt/GBAKeyEditor.cpp | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index f8524fd2d..1d450bbe9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,7 @@ Bugfixes:
  - Wii: Fix tilting direction
  - SDL: Fix joystick initialization on BS
  - SDL: Fix potential joystick crash in games with rumble
+ - Qt: Fix initial state of key mapping
 Misc:
  - GBA: Slightly optimize GBAProcessEvents
  - Qt: Add preset for DualShock 4
diff --git a/src/platform/qt/GBAKeyEditor.cpp b/src/platform/qt/GBAKeyEditor.cpp
index 4594fbabd..20744b6da 100644
--- a/src/platform/qt/GBAKeyEditor.cpp
+++ b/src/platform/qt/GBAKeyEditor.cpp
@@ -254,9 +254,7 @@ void GBAKeyEditor::lookupBinding(const GBAInputMap* map, KeyEditor* keyEditor, G
 #ifdef BUILD_SDL
 	if (m_type == SDL_BINDING_BUTTON) {
 		int value = GBAInputQueryBinding(map, m_type, key);
-		if (value != GBA_KEY_NONE) {
-			keyEditor->setValueButton(value);
-		}
+		keyEditor->setValueButton(value);
 		return;
 	}
 #endif