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

xwayland: disconnect display destroy listener even if xwayland didn't initialize

This commit is contained in:
Ilia Bozhinov 2020-09-04 13:03:21 +02:00 committed by Simon Ser
parent e44bed0c2b
commit 3e03f786ee
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xwayland/server.c
View File

@ -150,7 +150,13 @@ static void server_finish_process(struct wlr_xwayland_server *server) {
} }
static void server_finish_display(struct wlr_xwayland_server *server) { static void server_finish_display(struct wlr_xwayland_server *server) {
if (!server || server->display == -1) { if (!server) {
return;
}
wl_list_remove(&server->display_destroy.link);
if (server->display == -1) {
return; return;
} }
@ -158,8 +164,6 @@ static void server_finish_display(struct wlr_xwayland_server *server) {
safe_close(server->x_fd[1]); safe_close(server->x_fd[1]);
server->x_fd[0] = server->x_fd[1] = -1; server->x_fd[0] = server->x_fd[1] = -1;
wl_list_remove(&server->display_destroy.link);
unlink_display_sockets(server->display); unlink_display_sockets(server->display);
server->display = -1; server->display = -1;
server->display_name[0] = '\0'; server->display_name[0] = '\0';