aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2018-07-18 23:50:28 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-11-09 15:31:57 +0100
commit7487d7fa2dbc69fe39f81dd5b3e9a1a32ee7a2e0 (patch)
tree5f4cd881af9b36eb7b32410878e5a0f583aaa8f2
parent6625e78c1292f2dc03329e55bbc33537cc8ee569 (diff)
downloadnx-libs-7487d7fa2dbc69fe39f81dd5b3e9a1a32ee7a2e0.tar.gz
nx-libs-7487d7fa2dbc69fe39f81dd5b3e9a1a32ee7a2e0.tar.bz2
nx-libs-7487d7fa2dbc69fe39f81dd5b3e9a1a32ee7a2e0.zip
XKB: Fix logic error
commit 6aef4e96affcc26b9415c6bc9c9bebb5af05a1a7 Author: Daniel Stone <daniel@fooishbar.org> Date: Sat Jan 17 13:42:46 2009 +0200 XKB: Fix logic error Use logical or instead of bitwise or. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Backported-to-nx-by: Ulrich Sibiller <uli42@gmx.de>
-rw-r--r--nx-X11/programs/Xserver/xkb/xkbAccessX.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbAccessX.c b/nx-X11/programs/Xserver/xkb/xkbAccessX.c
index cfd42334c..dd07713b8 100644
--- a/nx-X11/programs/Xserver/xkb/xkbAccessX.c
+++ b/nx-X11/programs/Xserver/xkb/xkbAccessX.c
@@ -607,7 +607,7 @@ Bool ignoreKeyEvent = FALSE;
ev.keycode= key;
ev.slowKeysDelay= ctrls->slow_keys_delay;
ev.debounceDelay= ctrls->debounce_delay;
- if (BitIsOn(keybd->key->down,key) | (xkbi->mouseKey == key)) {
+ if (BitIsOn(keybd->key->down,key) || (xkbi->mouseKey == key)) {
ev.detail= XkbAXN_SKRelease;
beep_type= _BEEP_SLOW_RELEASE;
}