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

xwayland: Don't discard ready signals 

The xwayland ready signals are used to do initial setup like starting xwm.
Discarding the signals means that the handler functions will not be called
in the case that Xwayland is restarted and thus, xwm managed clients fail.

Fixes #2174."
This commit is contained in:
Scott Moreau 2020-06-20 11:03:23 -06:00 committed by Simon Ser
parent c611a8f7e7
commit 84d2f30faa
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xwayland/server.c
View File

@ -232,8 +232,6 @@ static int xserver_handle_ready(int signal_number, void *data) {
.wm_fd = server->wm_fd[0], .wm_fd = server->wm_fd[0],
}; };
wlr_signal_emit_safe(&server->events.ready, &event); wlr_signal_emit_safe(&server->events.ready, &event);
/* ready is a one-shot signal, fire and forget */
wl_signal_init(&server->events.ready);
return 1; /* wayland event loop dispatcher's count */ return 1; /* wayland event loop dispatcher's count */

2
xwayland/xwayland.c
View File

@ -55,8 +55,6 @@ static void handle_server_ready(struct wl_listener *listener, void *data) {
} }
wlr_signal_emit_safe(&xwayland->events.ready, NULL); wlr_signal_emit_safe(&xwayland->events.ready, NULL);
/* ready is a one-shot signal, fire and forget */
wl_signal_init(&xwayland->events.ready);
} }
void wlr_xwayland_destroy(struct wlr_xwayland *xwayland) { void wlr_xwayland_destroy(struct wlr_xwayland *xwayland) {