mirror of https://github.com/mpv-player/mpv
x11: don't wait until window is destroyed
This can hang if the window was destroyed externally (or that's what I
suspect happens), and we somehow didn't receive the DestroyNotify event.
I'm not sure why we wouldn't receive this event (since it should just be
in the xlib event queue), but on the other hand there's no real need to
wait for window destruction.
This essentially reverts 97fc74e2
.
This commit is contained in:
parent
bce2be7b3e
commit
cea7528b39
|
@ -656,11 +656,6 @@ void vo_x11_uninit(struct vo *vo)
|
|||
|
||||
XSelectInput(x11->display, x11->window, StructureNotifyMask);
|
||||
XDestroyWindow(x11->display, x11->window);
|
||||
XEvent xev;
|
||||
do {
|
||||
XNextEvent(x11->display, &xev);
|
||||
} while (xev.type != DestroyNotify ||
|
||||
xev.xdestroywindow.event != x11->window);
|
||||
}
|
||||
if (x11->xic)
|
||||
XDestroyIC(x11->xic);
|
||||
|
|
Loading…
Reference in New Issue