aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-25 08:57:48 +0000
committermarha <marha@users.sourceforge.net>2010-05-25 08:57:48 +0000
commit4d1b98ace5efb02c14c7a4e36fc2698a1e00b66f (patch)
tree456b739c6aed0350fa1f1faa5e48c00d6aa8c186 /xorg-server/dix
parent33b487abbf3fa5c2798f7a753607fb227878e119 (diff)
parent74fa9a70a4817660f1c2ec3b3cc2bbe56db4fc58 (diff)
downloadvcxsrv-4d1b98ace5efb02c14c7a4e36fc2698a1e00b66f.tar.gz
vcxsrv-4d1b98ace5efb02c14c7a4e36fc2698a1e00b66f.tar.bz2
vcxsrv-4d1b98ace5efb02c14c7a4e36fc2698a1e00b66f.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/dix')
-rw-r--r--xorg-server/dix/devices.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c
index c8b2940bc..58eee47ca 100644
--- a/xorg-server/dix/devices.c
+++ b/xorg-server/dix/devices.c
@@ -463,7 +463,8 @@ ActivateDevice(DeviceIntPtr dev, BOOL sendevent)
/* Initialize memory for sprites. */
if (IsMaster(dev) && dev->spriteInfo->spriteOwner)
- pScreen->DeviceCursorInitialize(dev, pScreen);
+ if (!pScreen->DeviceCursorInitialize(dev, pScreen))
+ ret = BadAlloc;
SendDevicePresenceEvent(dev->id, DeviceAdded);
if (sendevent)