diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-12-14 10:49:21 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-12-14 10:49:21 +0100 |
| commit | 1d301c517e613dbb7e14e8b5fe5552919366fc4e (patch) | |
| tree | fbcc0812cafcd14eb4512bb66b751314736671fc /nx-X11/programs/Xserver/Xi/chgfctl.c | |
| parent | 91ca51bffc299519f723cc3adeb207bbad8a26c3 (diff) | |
| parent | 8bb1579f40bb74b9dad302e79c124541694b3265 (diff) | |
| download | nx-libs-1d301c517e613dbb7e14e8b5fe5552919366fc4e.tar.gz nx-libs-1d301c517e613dbb7e14e8b5fe5552919366fc4e.tar.bz2 nx-libs-1d301c517e613dbb7e14e8b5fe5552919366fc4e.zip | |
Merge branch 'sunweaver-pr/fix-compiler-warnings' into 3.6.x
Attributes GH PR #333: https://github.com/ArcticaProject/nx-libs/pull/333
Diffstat (limited to 'nx-X11/programs/Xserver/Xi/chgfctl.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xi/chgfctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/Xi/chgfctl.c b/nx-X11/programs/Xserver/Xi/chgfctl.c index 341c794ce..a5ad73d11 100644 --- a/nx-X11/programs/Xserver/Xi/chgfctl.c +++ b/nx-X11/programs/Xserver/Xi/chgfctl.c @@ -358,9 +358,9 @@ ChangeKbdFeedback (client, dev, mask, k, f) kctrl.autoRepeat = defaultKeyboardControl.autoRepeat; else kctrl.autoRepeats[inx] &= ~kmask; - kctrl.autoRepeats[inx] = - (kctrl.autoRepeats[inx] & ~kmask) | - (defaultKeyboardControl.autoRepeats[inx] & kmask); + kctrl.autoRepeats[inx] = + (kctrl.autoRepeats[inx] & ~kmask) | + (defaultKeyboardControl.autoRepeats[inx] & kmask); } else { |