Imported Debian patch 2:1.11.4-0ubuntu10.1

[glsdk/xserver.git] / dix / touch.c

diff --git a/dix/touch.c b/dix/touch.c
index d04801c86ad327c70449aaeec747dada90b9acf2..0aa24f293d6c9ea630dbcd1f61daceaaacf15fa2 100644 (file)
--- a/dix/touch.c
+++ b/dix/touch.c
@@ -524,7 +524,8 @@ TouchBuildDependentSpriteTrace(DeviceIntPtr dev, SpritePtr sprite)
     /* All touches should have the same sprite trace, so find and reuse an
      * existing touch's sprite if possible, else use the device's sprite. */
     for (i = 0; i < t->num_touches; i++)
     /* All touches should have the same sprite trace, so find and reuse an
      * existing touch's sprite if possible, else use the device's sprite. */
     for (i = 0; i < t->num_touches; i++)

-        if (t->touches[i].sprite.spriteTraceGood > 0)
+        if (!t->touches[i].pending_finish &&
+            t->touches[i].sprite.spriteTraceGood > 0)

             break;
     if (i < t->num_touches)
         srcsprite = &t->touches[i].sprite;
             break;
     if (i < t->num_touches)
         srcsprite = &t->touches[i].sprite;