Miroirs/sway-patched-tray-menu
1
0
Fork 0
mirror of https://github.com/NickHu/sway synced 2024-12-26 21:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

xwayland: fix mapped state check in OR handlers

Browse source
This commit is contained in:
Kirill Primak 2023-06-03 07:43:13 +03:00 committed by Simon Ser
parent c001a57e8b
commit b5cb49bce9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/desktop/xwayland.c
View file

@ -178,7 +178,7 @@ static void unmanaged_handle_override_redirect(struct wl_listener *listener, voi
wl_container_of(listener, surface, override_redirect); wl_container_of(listener, surface, override_redirect);
struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface; struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
bool mapped = xsurface->surface != NULL || xsurface->surface->mapped; bool mapped = xsurface->surface != NULL && xsurface->surface->mapped;
if (mapped) { if (mapped) {
unmanaged_handle_unmap(&surface->unmap, NULL); unmanaged_handle_unmap(&surface->unmap, NULL);
} }
@ -537,7 +537,7 @@ static void handle_override_redirect(struct wl_listener *listener, void *data) {
struct sway_view *view = &xwayland_view->view; struct sway_view *view = &xwayland_view->view;
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
bool mapped = xsurface->surface != NULL || xsurface->surface->mapped; bool mapped = xsurface->surface != NULL && xsurface->surface->mapped;
if (mapped) { if (mapped) {
handle_unmap(&xwayland_view->unmap, NULL); handle_unmap(&xwayland_view->unmap, NULL);
} }