wl: Only use xdg-decoration if it's supported by the compositor

Igalia · Jun 14, 2024 · 42b00d7 · 42b00d7
1 parent b40c212
commit 42b00d7
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/platform/wayland/cog-viewport-wl.c b/platform/wayland/cog-viewport-wl.c
@@ -280,10 +280,13 @@ cog_wl_viewport_create_window(CogWlViewport *viewport, GError **error)
          * because knowing the compositor's preference is pointless because
          * there is no support for painting client-side decorations.
          */
-        viewport->window.xdg_decoration =
-            zxdg_decoration_manager_v1_get_toplevel_decoration(display->xdg_decoration, viewport->window.xdg_toplevel);
-        zxdg_toplevel_decoration_v1_set_mode(viewport->window.xdg_decoration,
-                                             ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE);
+        if (display->xdg_decoration != NULL) {
+            viewport->window.xdg_decoration =
+                zxdg_decoration_manager_v1_get_toplevel_decoration(display->xdg_decoration,
+                                                                   viewport->window.xdg_toplevel);
+            zxdg_toplevel_decoration_v1_set_mode(viewport->window.xdg_decoration,
+                                                 ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE);
+        }
 #endif /* COG_HAVE_XDG_DECORATION_UNSTABLE_V1 */
 
         xdg_toplevel_add_listener(viewport->window.xdg_toplevel, &xdg_toplevel_listener, viewport);