diff options
| author | Dudemanguy <random342@airmail.cc> | 2022-06-11 10:09:00 -0500 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2022-06-11 10:20:06 -0500 |
| commit | 602995fd40f03440f5fa64113b6188cb46ffcc9c (patch) | |
| tree | 5738bf2e04180fca0b11c0d7aad93025f9e0988f /video/out | |
| parent | b3ef506932c3fc281b1e16c951fc6abc1ba429ce (diff) | |
| download | mpv-602995fd40f03440f5fa64113b6188cb46ffcc9c.tar.bz2 mpv-602995fd40f03440f5fa64113b6188cb46ffcc9c.tar.xz | |
wayland: set appid before initial surface commit
This shouldn't have mattered but apparently qtile is unable to get the
app id if you set it after the initial surface commit. Wayland is a mess
anyway so just shuffle this around so that the frame callback and
surface commit are the last things registered in vo_wayland_init. This
works around qtile and, in theory, doesn't appear to break anything
else. Fixes #10280.
Diffstat (limited to 'video/out')
| -rw-r--r-- | video/out/wayland_common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c index 865a073716..698cec1ec8 100644 --- a/video/out/wayland_common.c +++ b/video/out/wayland_common.c @@ -1905,13 +1905,13 @@ int vo_wayland_init(struct vo *vo) wl->opts = mp_get_config_group(wl, wl->vo->global, &wayland_conf); wl->display_fd = wl_display_get_fd(wl->display); + update_app_id(wl); + mp_make_wakeup_pipe(wl->wakeup_pipe); + wl->frame_callback = wl_surface_frame(wl->surface); wl_callback_add_listener(wl->frame_callback, &frame_listener, wl); wl_surface_commit(wl->surface); - update_app_id(wl); - mp_make_wakeup_pipe(wl->wakeup_pipe); - return true; } |