mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-15 08:56:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix segfault when closing xwayland views

Browse source
This commit is contained in:
emersion 2017-11-20 18:05:24 +01:00
parent c3e0fbdb8f
commit 6a06c3d907
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
4 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rootston/xwayland.c
View file

@ -95,6 +95,8 @@ static void maximize(struct roots_view *view, bool maximized) {
static void handle_destroy(struct wl_listener *listener, void *data) {
struct roots_xwayland_surface *roots_surface =
wl_container_of(listener, roots_surface, destroy);
struct wlr_xwayland_surface *xwayland_surface =
roots_surface->view->xwayland_surface;
wl_list_remove(&roots_surface->destroy.link);
wl_list_remove(&roots_surface->request_configure.link);
wl_list_remove(&roots_surface->request_move.link);
@ -102,6 +104,9 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
wl_list_remove(&roots_surface->request_maximize.link);
wl_list_remove(&roots_surface->map_notify.link);
wl_list_remove(&roots_surface->unmap_notify.link);
if (xwayland_surface->mapped) {
wl_list_remove(&roots_surface->view->link);
}
view_destroy(roots_surface->view);
free(roots_surface);
}
@ -243,6 +248,7 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
view->close = close;
roots_surface->view = view;
view_init(view, desktop);
wl_list_insert(&desktop->views, &view->link);
if (!surface->override_redirect) {
view_setup(view);