summaryrefslogtreecommitdiff
path: root/mi
diff options
context:
space:
mode:
authorPierre Willenbrock <pierre@pirsoft.de>2009-07-14 13:42:19 +0200
committerPeter Hutterer <peter.hutterer@who-t.net>2009-07-17 14:40:54 +1000
commitc806162c133603a99d9cd844bb04485bb663707d (patch)
tree3e00692447910cb88efcc812a93d8cbaa3f6e044 /mi
parent4db8950b1dfc3150ee2e9f1f975e9ecb4eabb1f2 (diff)
Always update u.lastSlave
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'mi')
-rw-r--r--mi/mieq.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mi/mieq.c b/mi/mieq.c
index f9ceab2fa..562580200 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -393,17 +393,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 */