aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix/window.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-11-04 16:20:49 +0000
committermarha <marha@users.sourceforge.net>2010-11-04 16:20:49 +0000
commit840f23bc506c991216214aa4cfc87978ef739a77 (patch)
tree3c88f8bea334c218a879322d6c60e14b4977e7d2 /xorg-server/dix/window.c
parentb50a4f12cd633b412387c4cddc0adbb45256acfe (diff)
parent41c64098a90b4e974d5005a1619472f2e8a64ea1 (diff)
downloadvcxsrv-840f23bc506c991216214aa4cfc87978ef739a77.tar.gz
vcxsrv-840f23bc506c991216214aa4cfc87978ef739a77.tar.bz2
vcxsrv-840f23bc506c991216214aa4cfc87978ef739a77.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/dix/window.c')
-rw-r--r--xorg-server/dix/window.c6
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;