[vlc-commits] xdg-shell: SSDs are required

Rémi Denis-Courmont git at videolan.org
Sun May 20 19:52:36 CEST 2018


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun May 20 19:40:07 2018 +0300| [e4f5757cb6e5108e6a65cdf270af7f2cffdc0d47] | committer: Rémi Denis-Courmont

xdg-shell: SSDs are required

...when video-deco is enabled.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e4f5757cb6e5108e6a65cdf270af7f2cffdc0d47
---

 modules/video_output/wayland/xdg-shell.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/video_output/wayland/xdg-shell.c b/modules/video_output/wayland/xdg-shell.c
index 0fab020dce..64100e4517 100644
--- a/modules/video_output/wayland/xdg-shell.c
+++ b/modules/video_output/wayland/xdg-shell.c
@@ -495,8 +495,12 @@ static int Open(vout_window_t *wnd, const vout_window_cfg_t *cfg)
                                                    sys->deco_manager, surface);
     if (sys->deco != NULL)
         org_kde_kwin_server_decoration_request_mode(sys->deco, deco_mode);
-    else if (deco_mode == ORG_KDE_KWIN_SERVER_DECORATION_MODE_SERVER)
+    else
+    if (deco_mode != ORG_KDE_KWIN_SERVER_DECORATION_MODE_CLIENT)
+    {
         msg_Err(wnd, "server-side decoration not supported");
+        goto error;
+    }
 
     //if (var_InheritBool (wnd, "keyboard-events"))
     //    do_something();



More information about the vlc-commits mailing list