diff options
author | wm4 <wm4@nowhere> | 2014-09-29 18:05:52 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-09-29 18:06:45 +0200 |
commit | 053196de84ea785bde70c3b544742a654191e258 (patch) | |
tree | ac1fd8779f9d01de409b8e237f418b8ecfa68ecf /video | |
parent | 50e131b43ed2951363b72f0f7dd65272e8b05da3 (diff) | |
download | mpv-053196de84ea785bde70c3b544742a654191e258.tar.bz2 mpv-053196de84ea785bde70c3b544742a654191e258.tar.xz |
x11: always wait for mapped when using --wid
Might help with embedding with mozplugger. I can't confirm whether it
fixes the issue.
See #1090.
Diffstat (limited to 'video')
-rw-r--r-- | video/out/x11_common.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/video/out/x11_common.c b/video/out/x11_common.c index 390d40a024..1c3ccb95e0 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -944,9 +944,10 @@ int vo_x11_check_events(struct vo *vo) break; case PropertyNotify: if (Event.xproperty.atom == x11->atom_frame_exts) { - if (!x11->pseudo_mapped) + if (!x11->pseudo_mapped && vo->opts->WinID < 0) { MP_VERBOSE(x11, "not waiting for MapNotify\n"); - x11->pseudo_mapped = true; + x11->pseudo_mapped = true; + } } break; default: |