From f0f5fb7b4eb685094fc64aa1b46573991e84589f Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Sun, 15 Oct 2006 00:26:21 -0700 Subject: 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 for identifying the bug and proposing a workaround. (cherry picked from c27e00ceceed3fea011c98c0e70ab568bf0687c6 commit) --- src/XExtInt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/XExtInt.c') diff --git a/src/XExtInt.c b/src/XExtInt.c index 811c0c3..2f61dce 100644 --- a/src/XExtInt.c +++ b/src/XExtInt.c @@ -189,12 +189,12 @@ _xidevicebusy(dpy, error) */ int -_XiCheckExtInit(dpy, version_index) +_XiCheckExtInit(dpy, version_index, info) register Display *dpy; register int version_index; + XExtDisplayInfo *info; { XExtensionVersion *ext; - XExtDisplayInfo *info = XInput_find_display(dpy); XInputCheckExtension(dpy, info, -1); -- cgit v1.2.3