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

Add beter handling for Xwayland failing at startup

This commit is contained in:
Vincent Vanlaer 2018-05-07 00:43:26 +02:00
parent dbf4f9a231
commit 446ea3a340
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xwayland/xwayland.c
View File

@ -178,17 +178,25 @@ static void handle_client_destroy(struct wl_listener *listener, void *data) {
struct wlr_xwayland *wlr_xwayland = struct wlr_xwayland *wlr_xwayland =
wl_container_of(listener, wlr_xwayland, client_destroy); wl_container_of(listener, wlr_xwayland, client_destroy);
if (wlr_xwayland->sigusr1_source) {
// Xwayland failed to start, let the sigusr1 handler deal with it
return;
}
// Don't call client destroy: it's being destroyed already // Don't call client destroy: it's being destroyed already
wlr_xwayland->client = NULL; wlr_xwayland->client = NULL;
wl_list_remove(&wlr_xwayland->client_destroy.link); wl_list_remove(&wlr_xwayland->client_destroy.link);
xwayland_finish_server(wlr_xwayland); xwayland_finish_server(wlr_xwayland);
if (wlr_xwayland->lazy) { if (time(NULL) - wlr_xwayland->server_start > 5) {
xwayland_start_server_lazy(wlr_xwayland); if (wlr_xwayland->lazy) {
} else if (time(NULL) - wlr_xwayland->server_start > 5) { wlr_log(L_INFO, "Restarting Xwayland (lazy)");
wlr_log(L_INFO, "Restarting Xwayland"); xwayland_start_server_lazy(wlr_xwayland);
xwayland_start_server(wlr_xwayland); } else {
wlr_log(L_INFO, "Restarting Xwayland");
xwayland_start_server(wlr_xwayland);
}
} }
} }