summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-02 18:14:30 +0200
committerAlessandro Ghedini <alessandro@ghedini.me>2014-10-11 13:53:41 +0200
commitb784083fb5fada876c94e2f6488e88a2827b9f92 (patch)
tree791fca4ddecea13d186ba5ff6cc3875159396589
parentd7cf596e2a13266cf914c6db03fe44527f29e58f (diff)
downloadmpv-b784083fb5fada876c94e2f6488e88a2827b9f92.tar.bz2
mpv-b784083fb5fada876c94e2f6488e88a2827b9f92.tar.xz
x11: fix --wid=0
Another fallout resulting from the changes whether or not to wait for mapping the window. In this case, it obviously makes no sense to wait for mapping, because the root window is always mapped. Mapping will never happen, and it would wait forever. Fixes #1139. CC: @mpv-player/stable
-rw-r--r--video/out/x11_common.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index d0f86af3aa..140069e289 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -1328,6 +1328,7 @@ void vo_x11_config_vo_window(struct vo *vo, XVisualInfo *vis, int flags,
if (opts->WinID >= 0) {
if (opts->WinID == 0) {
x11->window = x11->rootwin;
+ x11->pseudo_mapped = true;
XSelectInput(x11->display, x11->window, StructureNotifyMask);
} else {
XSelectInput(x11->display, opts->WinID, StructureNotifyMask);