From 18cfef63a4fbe450636aa3c8e56526efa09a903b Mon Sep 17 00:00:00 2001
From: hydrargyrum <dev@indigo.re>
Date: Mon, 12 May 2014 22:06:40 +0200
Subject: [PATCH] Re-enable Ctrl-X in the "choose key" dialog to shun a
 joystick button

---
 src/getkey.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/getkey.cpp b/src/getkey.cpp
index c3d0e9b..94e7bc9 100644
--- a/src/getkey.cpp
+++ b/src/getkey.cpp
@@ -46,8 +46,8 @@ bool GetKey::x11Event( XEvent* e )
         wasMouse = false;
         if (XKeycodeToKeysym(QX11Info::display(),e->xkey.keycode,0) == XK_x) {
             if (e->xkey.state & ControlMask) {
-                value = -1;
-                reject();
+                value = 0;
+                accept();
             }
             else {
                 value = e->xkey.keycode;