summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorTiago Vignatti <tiago.vignatti@nokia.com>2010-10-26 20:50:13 +0300
committerPeter Hutterer <peter.hutterer@who-t.net>2010-10-27 08:08:24 +1000
commita210068c5222acbdb04db17cb8cef314735bf977 (patch)
treeb76a7508d7488cce3a79f25c93fa9f670eefc030 /dix
parent290af0418f8c94355e42ad81aa7779b90e173fc9 (diff)
dix: advance parent window pointer when no node is found
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'dix')
-rw-r--r--dix/window.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/dix/window.c b/dix/window.c
index 1913030cf..edb146e97 100644
--- a/dix/window.c
+++ b/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;