From 4a49ec2e404e5beb33c96c7e72d4dfa268b9ad07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 14 Jul 2013 13:52:02 +0200 Subject: [PATCH] Fix silly key mapping bug. Update native with SDL gamepad support (that needs more work). --- UI/MenuScreens.cpp | 8 +++++--- native | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/UI/MenuScreens.cpp b/UI/MenuScreens.cpp index 9e4309bdb0..68422a0747 100644 --- a/UI/MenuScreens.cpp +++ b/UI/MenuScreens.cpp @@ -698,9 +698,11 @@ void ControlsScreen::update(InputState &input) { void KeyMappingNewKeyDialog::key(const KeyInput &key) { if (key.flags & KEY_DOWN) { - last_kb_deviceid = key.deviceId; - last_kb_key = key.keyCode; - last_axis_id = -1; + if (key.keyCode != KEYCODE_EXT_MOUSEBUTTON_1) { + last_kb_deviceid = key.deviceId; + last_kb_key = key.keyCode; + last_axis_id = -1; + } } } diff --git a/native b/native index ca7eb305e4..ed1f13a33f 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit ca7eb305e44b75307ff904f73e4e946f5a9f1395 +Subproject commit ed1f13a33fdb5a210d35ac57a4cfc59b0a67a1a4