diff options
| author | marha <marha@users.sourceforge.net> | 2010-11-04 16:20:49 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-11-04 16:20:49 +0000 |
| commit | 840f23bc506c991216214aa4cfc87978ef739a77 (patch) | |
| tree | 3c88f8bea334c218a879322d6c60e14b4977e7d2 /xorg-server/dix | |
| parent | b50a4f12cd633b412387c4cddc0adbb45256acfe (diff) | |
| parent | 41c64098a90b4e974d5005a1619472f2e8a64ea1 (diff) | |
| download | vcxsrv-840f23bc506c991216214aa4cfc87978ef739a77.tar.gz vcxsrv-840f23bc506c991216214aa4cfc87978ef739a77.tar.bz2 vcxsrv-840f23bc506c991216214aa4cfc87978ef739a77.zip | |
svn merge ^/branches/released .
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;
|