From a9086518219c0ace4a5d81c2f7219dae3b6aa20c Mon Sep 17 00:00:00 2001 From: Kirill Primak Date: Wed, 26 Jul 2023 20:32:33 +0300 Subject: chore: chase wlroots xdg-surface role rework --- sway/desktop/layer_shell.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sway/desktop') diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c index d990d92a..8c6cedfe 100644 --- a/sway/desktop/layer_shell.c +++ b/sway/desktop/layer_shell.c @@ -35,13 +35,13 @@ struct wlr_layer_surface_v1 *toplevel_layer_surface_from_surface( } // Layer surface popup - struct wlr_xdg_surface * xdg_popup = NULL; - if ((xdg_popup = wlr_xdg_surface_try_from_wlr_surface(surface)) && - xdg_popup->role == WLR_XDG_SURFACE_ROLE_POPUP) { - if (!xdg_popup->popup->parent) { + struct wlr_xdg_surface *xdg_surface = NULL; + if ((xdg_surface = wlr_xdg_surface_try_from_wlr_surface(surface)) && + xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP && xdg_surface->popup != NULL) { + if (!xdg_surface->popup->parent) { return NULL; } - surface = wlr_surface_get_root_surface(xdg_popup->popup->parent); + surface = wlr_surface_get_root_surface(xdg_surface->popup->parent); continue; } -- cgit v1.2.3