[X2Go-Commits] [nx-libs] 97/108: XKB: Fix logic error

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit 7487d7fa2dbc69fe39f81dd5b3e9a1a32ee7a2e0
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Wed Jul 18 23:50:28 2018 +0200

    XKB: Fix logic error
    
        commit 6aef4e96affcc26b9415c6bc9c9bebb5af05a1a7
        Author: Daniel Stone <daniel at 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 at fooishbar.org>
            Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    
        Backported-to-nx-by: Ulrich Sibiller <uli42 at gmx.de>
---
 nx-X11/programs/Xserver/xkb/xkbAccessX.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nx-X11/programs/Xserver/xkb/xkbAccessX.c b/nx-X11/programs/Xserver/xkb/xkbAccessX.c
index cfd4233..dd07713 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;
 	}

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git