summaryrefslogtreecommitdiff
path: root/src/XGetDCtl.c
diff options
context:
space:
mode:
authorJamey Sharp <jamey@minilop.net>2006-10-15 00:26:21 -0700
committerJamey Sharp <jamey@minilop.net>2006-10-15 00:33:56 -0700
commitc27e00ceceed3fea011c98c0e70ab568bf0687c6 (patch)
tree62871bc653a38f2477f8043e7b17e4657cb48436 /src/XGetDCtl.c
parent5dda1e1509d40ef64ebc816ce538cef462a4fa51 (diff)
Don't call XInput_find_display in _XiCheckExtInit, while the Display lock is held.
All callers of _XiCheckExtInit have already called XInput_find_display first outside the lock, so just pass their copy of the XExtDisplayInfo structure down. Besides being more correct, this should be slightly faster. :-) Thanks to Magnus Kessler <Magnus.Kessler@gmx.net> for identifying the bug and proposing a workaround.
Diffstat (limited to 'src/XGetDCtl.c')
-rw-r--r--src/XGetDCtl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/XGetDCtl.c b/src/XGetDCtl.c
index 139f7e7..8d034bf 100644
--- a/src/XGetDCtl.c
+++ b/src/XGetDCtl.c
@@ -78,7 +78,7 @@ XGetDeviceControl(dpy, dev, control)
XExtDisplayInfo *info = XInput_find_display(dpy);
LockDisplay(dpy);
- if (_XiCheckExtInit(dpy, XInput_Add_XChangeDeviceControl) == -1)
+ if (_XiCheckExtInit(dpy, XInput_Add_XChangeDeviceControl, info) == -1)
return ((XDeviceControl *) NoSuchExtension);
GetReq(GetDeviceControl, req);