From f5e157731e6b51421ac89cfefb666b8bbf971b03 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 17 Jul 2013 13:18:21 +0200
Subject: mesa mkfontscale xserver git update 17 Jul 2013

xserver          commit 74469895e39fa38337f59edd64c4031ab9bb51d8
mkfontscale      commit f48de13423c7300f4da9f61993b624426b38ddc0
mesa             commit b20e0fb5204ea85904e9f72f583e65bf35b446cb
---
 xorg-server/dix/events.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'xorg-server/dix/events.c')

diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c
index 03b2d2ea7..ed3138d07 100644
--- a/xorg-server/dix/events.c
+++ b/xorg-server/dix/events.c
@@ -1441,7 +1441,8 @@ UpdateTouchesForGrab(DeviceIntPtr mouse)
                 listener->type = LISTENER_POINTER_GRAB;
             else
                 listener->type = LISTENER_GRAB;
-            FreeGrab(listener->grab);
+            if (listener->grab)
+                FreeGrab(listener->grab);
             listener->grab = AllocGrab(grab);
         }
     }
-- 
cgit v1.2.3