From 41c64098a90b4e974d5005a1619472f2e8a64ea1 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 4 Nov 2010 15:41:28 +0000 Subject: xserver git update 4/11/2010 --- xorg-server/dix/window.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xorg-server/dix/window.c') 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; -- cgit v1.2.3