diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-06 13:39:40 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-06 13:39:40 +0200 |
| commit | d53900c52abc2402f978b72278712e4bcdbde9f2 (patch) | |
| tree | 689cedc44df148a96d68ef460cff6b1756f096b6 /xorg-server/hw/kdrive | |
| parent | 36eb733ed5aaaeaefc49c8894bf213d16b58d242 (diff) | |
| parent | 2414a1de3cc17f438219f8f2a58b530d33e99a5e (diff) | |
| download | vcxsrv-d53900c52abc2402f978b72278712e4bcdbde9f2.tar.gz vcxsrv-d53900c52abc2402f978b72278712e4bcdbde9f2.tar.bz2 vcxsrv-d53900c52abc2402f978b72278712e4bcdbde9f2.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa pixman xserver xkeyboard-config
Conflicts:
xorg-server/dix/dispatch.c
Diffstat (limited to 'xorg-server/hw/kdrive')
| -rw-r--r-- | xorg-server/hw/kdrive/src/kinput.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c index 0190cdd72..0c6ce1936 100644 --- a/xorg-server/hw/kdrive/src/kinput.c +++ b/xorg-server/hw/kdrive/src/kinput.c @@ -241,7 +241,7 @@ KdUnregisterFd(void *closure, int fd, Bool do_close) if (do_close) close(kdInputFds[i].fd); kdNumInputFds--; - for (j = i; j < kdNumInputFds; j++) + for (j = i; j < (kdNumInputFds - 1); j++) kdInputFds[j] = kdInputFds[j + 1]; break; } |