From 8ced055cb99b403ed1a8db8dae533b22d896a380 Mon Sep 17 00:00:00 2001 From: John Lindgren Date: Tue, 11 Nov 2025 16:45:28 -0500 Subject: [PATCH] xwayland: remove obsolete (since wlroots 0.17) NULL check Since d7dc6e01b446 ("Chase wlroots: Unified mapping"), the map event is emitted by the wlr_surface itself, thus it cannot be NULL. Change the "if" to an "assert" accordingly. --- src/xwayland.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/xwayland.c b/src/xwayland.c index 47b6d12f..1dda710b 100644 --- a/src/xwayland.c +++ b/src/xwayland.c @@ -799,20 +799,11 @@ xwayland_view_map(struct view *view) struct wlr_xwayland_surface *xwayland_surface = xwayland_view->xwayland_surface; assert(xwayland_surface); + assert(xwayland_surface->surface); if (view->mapped) { return; } - if (!xwayland_surface->surface) { - /* - * We may get here if a user minimizes an xwayland dialog at the - * same time as the client requests unmap, which xwayland - * clients sometimes do without actually requesting destroy - * even if they don't intend to use that view/surface anymore - */ - wlr_log(WLR_DEBUG, "Cannot map view without wlr_surface"); - return; - } /* * The map_request event may not be received when an unmanaged