aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Primak <vyivel@eclair.cafe>2023-06-03 07:43:13 +0300
committerSimon Ser <contact@emersion.fr>2023-06-03 09:12:12 +0200
commitb5cb49bce90bd4d37f08da6a65aba6a99cb7c608 (patch)
tree1eb60036b676bd922551a9bb260244ea469ea625
parentc001a57e8bb2912bfce293e71d32fdbe246eae74 (diff)
xwayland: fix mapped state check in OR handlers
-rw-r--r--sway/desktop/xwayland.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index bb4340f1..a52cf4ad 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -178,7 +178,7 @@ static void unmanaged_handle_override_redirect(struct wl_listener *listener, voi
wl_container_of(listener, surface, override_redirect);
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) {
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 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) {
handle_unmap(&xwayland_view->unmap, NULL);
}