hyprwm
/
wlroots-hyprland
mirror of https://github.com/hyprwm/wlroots-hyprland.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compositor: don't call role unmap hook without an object

This commit is contained in:
Kirill Primak 2023-06-22 15:12:30 +03:00 committed by Simon Ser
parent 0f67580aab
commit fc9b58e84d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wlr/types/wlr_compositor.h
View File

@ -87,6 +87,9 @@ struct wlr_surface_role {
void (*commit)(struct wlr_surface *surface); void (*commit)(struct wlr_surface *surface);
/** /**
* Called when the surface is unmapped. May be NULL. * Called when the surface is unmapped. May be NULL.
*
* If the role is represented by an object, this is only called if
* such object exists.
*/ */
void (*unmap)(struct wlr_surface *surface); void (*unmap)(struct wlr_surface *surface);
/** /**

3
types/wlr_compositor.c
View File

@ -752,7 +752,8 @@ void wlr_surface_unmap(struct wlr_surface *surface) {
} }
surface->mapped = false; surface->mapped = false;
wl_signal_emit_mutable(&surface->events.unmap, NULL); wl_signal_emit_mutable(&surface->events.unmap, NULL);
if (surface->role != NULL && surface->role->unmap != NULL) { if (surface->role != NULL && surface->role->unmap != NULL &&
(surface->role_data != NULL || surface->role->no_object)) {
surface->role->unmap(surface); surface->role->unmap(surface);
} }