sway

commit 39534a1a614e911d4725a37b35208e4f347b6564
parent 8cc26130a66f533a5cbb8e4833a536dd8798f833
Author: emersion <contact@emersion.fr>
Date:   Wed,  4 Jul 2018 09:21:10 +0100

Merge pull request #2201 from martinetd/setenv-wl-display

startup: move setenv WAYLAND_DISPLAY before config execs
Diffstat:
M
sway/main.c
 | 
1
+
M
sway/server.c
 | 
1
-

2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/sway/main.c b/sway/main.c
@@ -416,6 +416,7 @@ int main(int argc, char **argv) {
 	security_sanity_check();
 
 	config->active = true;
+	setenv("WAYLAND_DISPLAY", server.socket, true);
 	// Execute commands until there are none left
 	while (config->cmd_queue->length) {
 		char *line = config->cmd_queue->items[0];
diff --git a/sway/server.c b/sway/server.c
@@ -143,7 +143,6 @@ void server_fini(struct sway_server *server) {
 void server_run(struct sway_server *server) {
 	wlr_log(L_INFO, "Running compositor on wayland display '%s'",
 			server->socket);
-	setenv("WAYLAND_DISPLAY", server->socket, true);
 	if (!wlr_backend_start(server->backend)) {
 		wlr_log(L_ERROR, "Failed to start backend");
 		wlr_backend_destroy(server->backend);