aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moreau <oreaus@gmail.com>2020-06-20 11:03:23 -0600
committerSimon Ser <contact@emersion.fr>2020-06-30 21:21:25 +0200
commit84d2f30faae963cdf9ec32ec015428c867ad1049 (patch)
tree062e99abb6c957609a34bf4e414ab53b2ff46575
parentc611a8f7e7df7a10b434500760dfbcfdf2817413 (diff)
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."
-rw-r--r--xwayland/server.c2
-rw-r--r--xwayland/xwayland.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/xwayland/server.c b/xwayland/server.c
index 3192e159..b257f245 100644
--- a/xwayland/server.c
+++ b/xwayland/server.c
@@ -232,8 +232,6 @@ static int xserver_handle_ready(int signal_number, void *data) {
.wm_fd = server->wm_fd[0],
};
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 */
diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c
index a28cd402..ccec7c67 100644
--- a/xwayland/xwayland.c
+++ b/xwayland/xwayland.c
@@ -55,8 +55,6 @@ static void handle_server_ready(struct wl_listener *listener, void *data) {
}
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) {