vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Oct 5 13:42:17 2019 +0300| [be6bd58d042515c9a82a0ad0ccf78c03b3c736e1] | committer: Rémi Denis-Courmont
wl_shell: fix error handling if decoration requested > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=be6bd58d042515c9a82a0ad0ccf78c03b3c736e1 --- modules/video_output/wayland/xdg-shell.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/video_output/wayland/xdg-shell.c b/modules/video_output/wayland/xdg-shell.c index a0288d9bdd..48e7679f3a 100644 --- a/modules/video_output/wayland/xdg-shell.c +++ b/modules/video_output/wayland/xdg-shell.c @@ -239,8 +239,6 @@ static void SetDecoration(vout_window_t *wnd, bool decorated) if (deco_mode != ZXDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE) msg_Err(wnd, "server-side decoration not supported"); } -#else -# define SetDecoration(wnd, deco) ((void) wnd, (void)(deco)) #endif static int Enable(vout_window_t *wnd, const vout_window_cfg_t *restrict cfg) @@ -253,7 +251,12 @@ static int Enable(vout_window_t *wnd, const vout_window_cfg_t *restrict cfg) else xdg_toplevel_unset_fullscreen(sys->toplevel); +#ifdef XDG_SHELL SetDecoration(wnd, cfg->is_decorated); +#else + if (cfg->is_decorated) + return VLC_EGENERIC; +#endif vout_window_SetSize(wnd, cfg->width, cfg->height); wl_surface_commit(wnd->handle.wl); wl_display_flush(display); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
