frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xi: when removing a device, reset ClientPointers where needed 

if a client had the to-be-removed device as ClientPointer, reset to NULL.

Fixes #43165

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Peter Hutterer 2011-11-29 16:15:37 +10:00
parent 27425f07b2
commit d2ebbcdaf6
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Xi/xichangehierarchy.c
View File

@ -200,6 +200,19 @@ unwind:
return rc; return rc;
} }
static int
disable_clientpointer(DeviceIntPtr dev)
{
int i;
for (i = 0; i < currentMaxClients; i++)
{
ClientPtr client = clients[i];
if (client && client->clientPtr == dev)
client->clientPtr = NULL;
}
}
static int static int
remove_master(ClientPtr client, xXIRemoveMasterInfo *r, remove_master(ClientPtr client, xXIRemoveMasterInfo *r,
int flags[MAXDEVICES]) int flags[MAXDEVICES])
@ -250,6 +263,8 @@ remove_master(ClientPtr client, xXIRemoveMasterInfo *r,
if (rc != Success) if (rc != Success)
goto unwind; goto unwind;
disable_clientpointer(ptr);
/* Disabling sends the devices floating, reattach them if /* Disabling sends the devices floating, reattach them if
* desired. */ * desired. */
if (r->return_mode == XIAttachToMaster) if (r->return_mode == XIAttachToMaster)