diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-30 10:59:17 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-30 10:59:17 +0100 |
commit | c8d69ebaeed8005d38c91613ab699747f45b2228 (patch) | |
tree | cd93f7cdaa242660d2c19ea5514cd3f674aaeb75 /nx-X11/programs/Xserver/xkb/xkbActions.c | |
parent | 105cd2be6dfce3579cb585a8d78f655f19cef57b (diff) | |
parent | 4821edfe0ecc2296745c4c5fcaa4c08245673c6e (diff) | |
download | nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.tar.gz nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.tar.bz2 nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.zip |
Merge branch 'uli42-pr/fix_shadowed_vars' into 3.6.x
Attributes GH PR #895: https://github.com/ArcticaProject/nx-libs/pull/895
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/xkbActions.c')
-rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbActions.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbActions.c b/nx-X11/programs/Xserver/xkb/xkbActions.c index eadef3bee..d51b3ade4 100644 --- a/nx-X11/programs/Xserver/xkb/xkbActions.c +++ b/nx-X11/programs/Xserver/xkb/xkbActions.c @@ -1040,10 +1040,10 @@ _XkbFilterDeviceBtn( XkbSrvInfoPtr xkbi, unsigned keycode, XkbAction * pAction) { -DeviceIntPtr dev; -int button; - if (filter->keycode==0) { /* initial press */ + DeviceIntPtr dev; + int button; + dev= _XkbLookupButtonDevice(pAction->devbtn.device,NULL); if ((!dev)||(!dev->public.on)||(&dev->public==LookupPointerDevice())) return 1; @@ -1081,7 +1081,8 @@ int button; } } else if (filter->keycode==keycode) { - int button; + DeviceIntPtr dev; + int button; filter->active= 0; dev= _XkbLookupButtonDevice(filter->upAction.devbtn.device,NULL); |