Set WAYLAND_DISPLAY earlier in startup

This commit is contained in:
Drew DeVault 2018-03-30 00:13:54 -04:00
parent 9d7f47746c
commit d6acb3d86c

View file

@ -102,12 +102,11 @@ void server_fini(struct sway_server *server) {
void server_run(struct sway_server *server) { void server_run(struct sway_server *server) {
wlr_log(L_INFO, "Running compositor on wayland display '%s'", wlr_log(L_INFO, "Running compositor on wayland display '%s'",
server->socket); server->socket);
setenv("_WAYLAND_DISPLAY", server->socket, true); setenv("WAYLAND_DISPLAY", server->socket, true);
if (!wlr_backend_start(server->backend)) { if (!wlr_backend_start(server->backend)) {
wlr_log(L_ERROR, "Failed to start backend"); wlr_log(L_ERROR, "Failed to start backend");
wlr_backend_destroy(server->backend); wlr_backend_destroy(server->backend);
return; return;
} }
setenv("WAYLAND_DISPLAY", server->socket, true);
wl_display_run(server->wl_display); wl_display_run(server->wl_display);
} }