diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-03-10 20:19:19 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-10 20:19:19 +0100 |
| commit | 320cece2e97035665d4df5e382ea45e5a7f07efa (patch) | |
| tree | e69e6342ece32a992ae29376697b4ecc691266de /nx-X11/programs/Xserver/dix/devices.c | |
| parent | dc8477f76372e685eb999a71afb4e5ec7e3176f1 (diff) | |
| parent | ee2a933c3d4ad65849443cc917c59ad479083ca8 (diff) | |
| download | nx-libs-320cece2e97035665d4df5e382ea45e5a7f07efa.tar.gz nx-libs-320cece2e97035665d4df5e382ea45e5a7f07efa.tar.bz2 nx-libs-320cece2e97035665d4df5e382ea45e5a7f07efa.zip | |
Merge branch 'uli42-pr/misc_cherries' into 3.6.x
Attributes GH PR #378: https://github.com/ArcticaProject/nx-libs/pull/378
Diffstat (limited to 'nx-X11/programs/Xserver/dix/devices.c')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/devices.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c index 3821d1290..d649a8657 100644 --- a/nx-X11/programs/Xserver/dix/devices.c +++ b/nx-X11/programs/Xserver/dix/devices.c @@ -117,7 +117,8 @@ _AddInputDevice(DeviceProc deviceProc, Bool autoStart) dev->xkb_interest= NULL; #endif dev->nPrivates = 0; - dev->devPrivates = dev->unwrapProc = NULL; + dev->devPrivates = NULL; + dev->unwrapProc = NULL; inputInfo.off_devices = dev; return dev; } |