Re-enable Ctrl-X in the "choose key" dialog to shun a joystick button

This commit is contained in:
hydrargyrum
2014-05-12 22:06:40 +02:00
parent 283ac91d95
commit 18cfef63a4

View File

@ -46,8 +46,8 @@ bool GetKey::x11Event( XEvent* e )
wasMouse = false; wasMouse = false;
if (XKeycodeToKeysym(QX11Info::display(),e->xkey.keycode,0) == XK_x) { if (XKeycodeToKeysym(QX11Info::display(),e->xkey.keycode,0) == XK_x) {
if (e->xkey.state & ControlMask) { if (e->xkey.state & ControlMask) {
value = -1; value = 0;
reject(); accept();
} }
else { else {
value = e->xkey.keycode; value = e->xkey.keycode;