diff options
| author | Tiago Vignatti <tiago.vignatti@nokia.com> | 2010-10-26 20:50:13 +0300 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-10 11:17:49 +1000 |
| commit | 97915c06d10544d47ca69bd3610fd114d70e071f (patch) | |
| tree | 78e197394d5391dabfad21770ac134bbef196697 | |
| parent | 4a2caa287d36128d4f7bf10ced7ecb0e505011b2 (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>
(cherry picked from commit a210068c5222acbdb04db17cb8cef314735bf977)
| -rw-r--r-- | dix/window.c | 6 |
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; |