From c86dd2d607c653c57e5c9ad10ba959d58dfb9fc2 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 17 Apr 2013 20:14:56 +1000 Subject: [PATCH 21/35] dix: use a tmp variable for the to-be-removed touch listener No functional changes. Signed-off-by: Peter Hutterer (cherry picked from commit 7dbf61817d3bd4b1fc71710677e56c5d8cfcdb4e) --- dix/touch.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dix/touch.c b/dix/touch.c index be4a7de..01a554e 100644 --- a/dix/touch.c +++ b/dix/touch.c @@ -719,12 +719,13 @@ TouchRemoveListener(TouchPointInfoPtr ti, XID resource) for (i = 0; i < ti->num_listeners; i++) { int j; + TouchListener *listener = &ti->listeners[i]; - if (ti->listeners[i].listener != resource) + if (listener->listener != resource) continue; - if (ti->listeners[i].grab) { - ti->listeners[i].grab = NULL; + if (listener->grab) { + listener->grab = NULL; ti->num_grabs--; } -- 1.8.2.1