diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-03-09 09:53:47 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-05-04 10:14:09 +1000 |
| commit | ea55d0d504805674ac06b589d673ed9884575846 (patch) | |
| tree | b1b6251d47faa509d1a265aa19ac13c859031b5e | |
| parent | d6328c6bfe49958f68abbb6ddbc1f1514de6831f (diff) | |
Xi: return the bad device ID if a passive grab fails with BadDevice.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
(cherry picked from commit 2a49ffa3c94819e9f28dd939f23ee8a675258172)
| -rw-r--r-- | Xi/xipassivegrab.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c index 4b71c688a..463002f63 100644 --- a/Xi/xipassivegrab.c +++ b/Xi/xipassivegrab.c @@ -99,7 +99,10 @@ ProcXIPassiveGrabDevice(ClientPtr client) { ret = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess); if (ret != Success) + { + client->errorValue = stuff->deviceid; return ret; + } } if (stuff->grab_type != XIGrabtypeButton && |