From 28a59ab73f60276102f5d3b63e4894ebb92a82ab Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Thu, 30 Jul 2026 11:07:29 +0200 Subject: wayland: fix version selection of the shape-manager global Use the smallest of the *implemented* version, and the *preferred* version. Before this, we used the minimum of our *required* version, and the *preferred* version, which is both useless and wrong, since we'll always pick the required version (since required <= preferred). --- wayland.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wayland.c b/wayland.c index baddb729..7f79d573 100644 --- a/wayland.c +++ b/wayland.c @@ -1536,10 +1536,10 @@ handle_global(void *data, struct wl_registry *registry, const uint32_t preferred = required; #endif - wayl->shape_manager_version = min(required, preferred); + wayl->shape_manager_version = min(version, preferred); wayl->cursor_shape_manager = wl_registry_bind( wayl->registry, name, &wp_cursor_shape_manager_v1_interface, - min(required, preferred)); + wayl->shape_manager_version); } else if (streq(interface, wp_single_pixel_buffer_manager_v1_interface.name)) { -- cgit v1.3