[PATCH v2] dix: advance parent window pointer when no node is found

[Peter Hutterer]

On Tue, Oct 26, 2010 at 08:50:13PM +0300, Tiago Vignatti wrote:
> Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
> Signed-off-by: Pauli Nieminen <ext-pauli.nieminen at nokia.com>
> ---
>  dix/window.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/dix/window.c b/dix/window.c
> index 1913030..edb146e 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;
> -- 
> 1.7.0.4

merged, thanks.

Cheers,
  Peter