diff options
author | wm4 <wm4@nowhere> | 2014-10-11 16:28:05 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-10-11 16:30:58 +0200 |
commit | cea7528b397d674711d68d0f11603891630afa7d (patch) | |
tree | ac97ac39bddd98004b24c5b7804883a4a412c29e /video/out/x11_common.c | |
parent | bce2be7b3e7bf95117a9e9879da8ca26169a6b57 (diff) | |
download | mpv-cea7528b397d674711d68d0f11603891630afa7d.tar.bz2 mpv-cea7528b397d674711d68d0f11603891630afa7d.tar.xz |
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.
Diffstat (limited to 'video/out/x11_common.c')
-rw-r--r-- | video/out/x11_common.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/video/out/x11_common.c b/video/out/x11_common.c index a9dc5f4aa5..b7e57a730a 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -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); |