diff options
author | Jamey Sharp <jamey@minilop.net> | 2006-10-15 00:26:21 -0700 |
---|---|---|
committer | Jamey Sharp <jamey@minilop.net> | 2006-10-15 00:33:56 -0700 |
commit | c27e00ceceed3fea011c98c0e70ab568bf0687c6 (patch) | |
tree | 62871bc653a38f2477f8043e7b17e4657cb48436 /src/XExtInt.c | |
parent | 5dda1e1509d40ef64ebc816ce538cef462a4fa51 (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/XExtInt.c')
-rw-r--r-- | src/XExtInt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/XExtInt.c b/src/XExtInt.c index aa838ef..b7297dc 100644 --- a/src/XExtInt.c +++ b/src/XExtInt.c @@ -191,12 +191,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); |