[PATCH 1/2] Always update u.lastSlave

[Pierre Willenbrock]

---
 mi/mieq.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mi/mieq.c b/mi/mieq.c
index 0f07b16..f050115 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -390,17 +390,17 @@ mieqProcessDeviceEvent(DeviceIntPtr dev,
     else {
         master = CopyGetMasterEvent(dev, event, masterEvents);
 
+        if (master)
+            master->u.lastSlave = dev;
+
         /* If someone's registered a custom event handler, let them
          * steal it. */
         if (handler)
         {
             handler(DequeueScreen(dev)->myNum, event, dev);
             if (master)
-            {
-                master->u.lastSlave = dev;
                 handler(DequeueScreen(master)->myNum,
                         (InternalEvent*)masterEvents->event, master);
-            }
         } else
         {
             /* process slave first, then master */
-- 
1.6.3.1


--------------060509070008070600020500
Content-Type: text/x-patch;
 name="0002-Check-dev-u.master-if-there-is-a-custom-event-handle.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename*0="0002-Check-dev-u.master-if-there-is-a-custom-event-handle.pa";
 filename*1="tch"