diff options
| -rw-r--r-- | types/wlr_xdg_shell.c | 4 | ||||
| -rw-r--r-- | types/wlr_xdg_shell_v6.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/types/wlr_xdg_shell.c b/types/wlr_xdg_shell.c index 5b02088d..76859d7b 100644 --- a/types/wlr_xdg_shell.c +++ b/types/wlr_xdg_shell.c @@ -173,7 +173,9 @@ static void xdg_surface_unmap(struct wlr_xdg_surface *surface) { assert(surface->role != WLR_XDG_SURFACE_ROLE_NONE); // TODO: probably need to ungrab before this event - wlr_signal_emit_safe(&surface->events.unmap, surface); + if (surface->mapped) { + wlr_signal_emit_safe(&surface->events.unmap, surface); + } if (surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) { wl_resource_set_user_data(surface->toplevel->resource, NULL); diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c index a0c74e6f..68fe4b29 100644 --- a/types/wlr_xdg_shell_v6.c +++ b/types/wlr_xdg_shell_v6.c @@ -173,7 +173,9 @@ static void xdg_surface_unmap(struct wlr_xdg_surface_v6 *surface) { assert(surface->role != WLR_XDG_SURFACE_V6_ROLE_NONE); // TODO: probably need to ungrab before this event - wlr_signal_emit_safe(&surface->events.unmap, surface); + if (surface->mapped) { + wlr_signal_emit_safe(&surface->events.unmap, surface); + } if (surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) { wl_resource_set_user_data(surface->toplevel->resource, NULL); |