blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xdg-shell: check for existing role before setting xdg_popup_surface_role 

Hopefully fixes #2056
This commit is contained in:
Greg V 2020-07-04 00:25:18 +03:00 committed by Simon Ser
parent 58bcec9d94
commit b2bd536308
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
types/xdg_shell/wlr_xdg_popup.c
View File

@ -288,11 +288,6 @@ void create_xdg_popup(struct wlr_xdg_surface *xdg_surface,
return; return;
} }
if (!wlr_surface_set_role(xdg_surface->surface, &xdg_popup_surface_role,
xdg_surface, xdg_surface->resource, XDG_WM_BASE_ERROR_ROLE)) {
return;
}
if (xdg_surface->role != WLR_XDG_SURFACE_ROLE_NONE) { if (xdg_surface->role != WLR_XDG_SURFACE_ROLE_NONE) {
wl_resource_post_error(xdg_surface->resource, wl_resource_post_error(xdg_surface->resource,
XDG_SURFACE_ERROR_ALREADY_CONSTRUCTED, XDG_SURFACE_ERROR_ALREADY_CONSTRUCTED,
@ -300,6 +295,11 @@ void create_xdg_popup(struct wlr_xdg_surface *xdg_surface,
return; return;
} }
if (!wlr_surface_set_role(xdg_surface->surface, &xdg_popup_surface_role,
xdg_surface, xdg_surface->resource, XDG_WM_BASE_ERROR_ROLE)) {
return;
}
assert(xdg_surface->popup == NULL); assert(xdg_surface->popup == NULL);
xdg_surface->popup = calloc(1, sizeof(struct wlr_xdg_popup)); xdg_surface->popup = calloc(1, sizeof(struct wlr_xdg_popup));
if (!xdg_surface->popup) { if (!xdg_surface->popup) {