summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-02 18:14:30 +0200
committerwm4 <wm4@nowhere>2014-10-02 18:14:30 +0200
commit6dad7d6fe74ee1193ad151cb54983f0191e8b89d (patch)
tree30e2748a820ecb0abe2d9613e2237bf6957b9a7e /video
parent7ffb6214344c91dff846f73096f0e7a2ddcc5d26 (diff)
downloadmpv-6dad7d6fe74ee1193ad151cb54983f0191e8b89d.tar.bz2
mpv-6dad7d6fe74ee1193ad151cb54983f0191e8b89d.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
Diffstat (limited to 'video')
-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);