mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-30 06:59:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

xwayland: remove obsolete (since wlroots 0.17) NULL check

Browse source 
Since d7dc6e01b4 ("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.
This commit is contained in:
John Lindgren 2025-11-11 16:45:28 -05:00 • committed by Consolatis
parent b35b935ab1
commit 8ced055cb9
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/xwayland.c
View file

@ -799,20 +799,11 @@ xwayland_view_map(struct view *view)
struct wlr_xwayland_surface *xwayland_surface = struct wlr_xwayland_surface *xwayland_surface =
xwayland_view->xwayland_surface; xwayland_view->xwayland_surface;
assert(xwayland_surface); assert(xwayland_surface);
assert(xwayland_surface->surface);
if (view->mapped) { if (view->mapped) {
return; 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 * The map_request event may not be received when an unmanaged