diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-06-23 21:39:51 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-06-23 21:39:51 +0200 |
| commit | 4a440feaf5c4ff7ac8d944a7a9832444fca924d3 (patch) | |
| tree | 4356a989e631c00f23dd12bce627b04c6e1172a9 /nx-X11/programs/Xserver/dix/devices.c | |
| parent | abf3741362f4c200945db6403fcd54df6754d4af (diff) | |
| parent | 3aabc92cf81f20b89dc49e8db3c56ad9fa08481b (diff) | |
| download | nx-libs-4a440feaf5c4ff7ac8d944a7a9832444fca924d3.tar.gz nx-libs-4a440feaf5c4ff7ac8d944a7a9832444fca924d3.tar.bz2 nx-libs-4a440feaf5c4ff7ac8d944a7a9832444fca924d3.zip | |
Merge branch 'uli42-pr/fix_xkb_privates' into 3.6.x
Attributes GH PR #818: https://github.com/ArcticaProject/nx-libs/pull/818
Diffstat (limited to 'nx-X11/programs/Xserver/dix/devices.c')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/devices.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c index 8ad1cc371..3dee81a25 100644 --- a/nx-X11/programs/Xserver/dix/devices.c +++ b/nx-X11/programs/Xserver/dix/devices.c @@ -73,6 +73,8 @@ SOFTWARE. #include "swaprep.h" #include "dixevents.h" +extern void XkbFreePrivates(DeviceIntPtr device); + DeviceIntPtr AddInputDevice(DeviceProc deviceProc, Bool autoStart) { @@ -275,6 +277,13 @@ CloseDevice(register DeviceIntPtr dev) #endif free(l); } + +#ifdef XKB + XkbFreePrivates(dev); +#endif + + free(dev->devPrivates); + free(dev->sync.event); free(dev); } |