diff options
| author | marha <marha@users.sourceforge.net> | 2010-10-14 13:54:23 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-10-14 13:54:23 +0000 |
| commit | 579eaaac4679bf78b1d987a56f4a24e7cf616368 (patch) | |
| tree | 53977d03cd6af212b3605ae3906d5e499e6d960e /xorg-server/dix/devices.c | |
| parent | bc5113fca69c8b05861a011426a4611985495cfe (diff) | |
| parent | d621ea397a3d181e7a0bf07d72bd21e116fccdb8 (diff) | |
| download | vcxsrv-579eaaac4679bf78b1d987a56f4a24e7cf616368.tar.gz vcxsrv-579eaaac4679bf78b1d987a56f4a24e7cf616368.tar.bz2 vcxsrv-579eaaac4679bf78b1d987a56f4a24e7cf616368.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/dix/devices.c')
| -rw-r--r-- | xorg-server/dix/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c index b124a7da4..338819e8d 100644 --- a/xorg-server/dix/devices.c +++ b/xorg-server/dix/devices.c @@ -2438,7 +2438,7 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master) WindowPtr currentRoot;
if (dev->spriteInfo->sprite)
- currentRoot = dev->spriteInfo->sprite->spriteTrace[0];
+ currentRoot = GetCurrentRootWindow(dev);
else /* new device auto-set to floating */
currentRoot = screenInfo.screens[0]->root;
|