diff options
author | marha <marha@users.sourceforge.net> | 2010-11-04 15:41:28 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-11-04 15:41:28 +0000 |
commit | 41c64098a90b4e974d5005a1619472f2e8a64ea1 (patch) | |
tree | df231908c0c9c03bc3af2bb1f47b8667b7dd567c /xorg-server/dix | |
parent | 135e2e73bbe7155901a651c38b772e7b4547f39c (diff) | |
download | vcxsrv-41c64098a90b4e974d5005a1619472f2e8a64ea1.tar.gz vcxsrv-41c64098a90b4e974d5005a1619472f2e8a64ea1.tar.bz2 vcxsrv-41c64098a90b4e974d5005a1619472f2e8a64ea1.zip |
xserver git update 4/11/2010
Diffstat (limited to 'xorg-server/dix')
-rw-r--r-- | xorg-server/dix/window.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/dix/window.c b/xorg-server/dix/window.c index f4d6ca5d8..485c3caea 100644 --- a/xorg-server/dix/window.c +++ b/xorg-server/dix/window.c @@ -3660,9 +3660,9 @@ WindowParentHasDeviceCursor(WindowPtr pWin, &pParentNode, &pParentPrev))
{
/* if there is a node in the list, the win has a dev cursor */
- if (!pParentNode->cursor) /* inherited. loop needs to cont. */
- {
- } else if (pParentNode->cursor == pCursor) /* inherit */
+ if (!pParentNode->cursor) /* inherited. */
+ pParent = pParent->parent;
+ else if (pParentNode->cursor == pCursor) /* inherit */
return TRUE;
else /* different cursor */
return FALSE;
|