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

dix: fix: don't return when device is same as argument. 

fix: set access default rule to 0 on init.
This commit is contained in:
Peter Hutterer 2007-03-15 21:48:19 +10:30
parent c5b07fb717
commit 456f429ad6
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dix/devices.c
View File

@ -2040,7 +2040,7 @@ GetPairedKeyboard(DeviceIntPtr ptr)
while(dev) while(dev)
{ {
if (ptr->pSprite == dev->pSprite) if (ptr != dev && ptr->pSprite == dev->pSprite)
return dev; return dev;
dev = dev->next; dev = dev->next;
} }

1
dix/window.c
View File

@ -3721,6 +3721,7 @@ MakeWindowOptional (register WindowPtr pWin)
optional->access.ndeny = 0; optional->access.ndeny = 0;
optional->access.perm = NULL; optional->access.perm = NULL;
optional->access.deny = NULL; optional->access.deny = NULL;
optional->access.defaultRule = 0;
parentOptional = FindWindowWithOptional(pWin)->optional; parentOptional = FindWindowWithOptional(pWin)->optional;
optional->visual = parentOptional->visual; optional->visual = parentOptional->visual;
if (!pWin->cursorIsNone) if (!pWin->cursorIsNone)