diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-04 15:38:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-04 15:38:04 +0000 |
| commit | 3592ad31cfc72ffff3c9024eecea7d3b987c7954 (patch) | |
| tree | 0e3b50cb6bcd0839b591d318a41d04b7cbd8e6e2 /xorg-server/Xi/xichangehierarchy.c | |
| parent | 79409465b0b8d5d38e6b94deb1943316f40c66eb (diff) | |
| parent | 0a5888393c68f6f7db86206d1f277232db18240b (diff) | |
| download | vcxsrv-3592ad31cfc72ffff3c9024eecea7d3b987c7954.tar.gz vcxsrv-3592ad31cfc72ffff3c9024eecea7d3b987c7954.tar.bz2 vcxsrv-3592ad31cfc72ffff3c9024eecea7d3b987c7954.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/Xi/xichangehierarchy.c')
| -rw-r--r-- | xorg-server/Xi/xichangehierarchy.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/Xi/xichangehierarchy.c b/xorg-server/Xi/xichangehierarchy.c index 6b0288c88..d48200b04 100644 --- a/xorg-server/Xi/xichangehierarchy.c +++ b/xorg-server/Xi/xichangehierarchy.c @@ -70,6 +70,8 @@ void XISendDeviceHierarchyEvent(int flags[MAXDEVICES]) ev = calloc(1, sizeof(xXIHierarchyEvent) +
MAXDEVICES * sizeof(xXIHierarchyInfo));
+ if (!ev)
+ return;
ev->type = GenericEvent;
ev->extension = IReqCode;
ev->evtype = XI_HierarchyChanged;
@@ -282,12 +284,12 @@ remove_master(ClientPtr client, xXIRemoveMasterInfo *r, for (attached = inputInfo.devices; attached; attached = attached->next)
{
if (!IsMaster(attached)) {
- if (attached->u.master == ptr)
+ if (GetMaster(attached, MASTER_ATTACHED) == ptr)
{
AttachDevice(client, attached, newptr);
flags[attached->id] |= XISlaveAttached;
}
- if (attached->u.master == keybd)
+ if (GetMaster(attached, MASTER_ATTACHED) == keybd)
{
AttachDevice(client, attached, newkeybd);
flags[attached->id] |= XISlaveAttached;
|