Merge pull request #3 from hydrargyrum/master

Re-enable Ctrl-X in the "choose key" dialog to shun a joystick button
2014-05-12 22:36:10 +02:00
parent 283ac91d95 18cfef63a4
commit 88ee6c1ed8
1 changed files with 2 additions and 2 deletions
--- 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;