diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-11-09 15:33:02 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-11-09 15:33:02 +0100 |
commit | fccef5fc5794c3aab5c28dbe354c3dc3a86cc07b (patch) | |
tree | 2afaa1a03cf49ef01796a4013513f01bdaf58eca /nx-X11/programs/Xserver/xkb/xkbEvents.c | |
parent | 122db3fde2b934df206567abc0c8b431962ce4b3 (diff) | |
parent | 3965f24befb21f469b887d4c69b9defc861831fb (diff) | |
download | nx-libs-fccef5fc5794c3aab5c28dbe354c3dc3a86cc07b.tar.gz nx-libs-fccef5fc5794c3aab5c28dbe354c3dc3a86cc07b.tar.bz2 nx-libs-fccef5fc5794c3aab5c28dbe354c3dc3a86cc07b.zip |
Merge branch 'uli42-pr/xkb_1.3.0.0' into 3.6.x
Attributes GH PR #717: https://github.com/ArcticaProject/nx-libs/pull/717
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/xkbEvents.c')
-rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbEvents.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbEvents.c b/nx-X11/programs/Xserver/xkb/xkbEvents.c index d6408a699..c7a0f9e87 100644 --- a/nx-X11/programs/Xserver/xkb/xkbEvents.c +++ b/nx-X11/programs/Xserver/xkb/xkbEvents.c @@ -207,6 +207,10 @@ int i; CARD32 changedControls; changedControls= 0; + + if (!kbd || !kbd->kbdfeed) + return 0; + if (old->enabled_ctrls!=new->enabled_ctrls) changedControls|= XkbControlsEnabledMask; if ((old->repeat_delay!=new->repeat_delay)|| |