diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-03-30 00:13:54 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2018-03-30 00:13:54 -0400 |
commit | d6acb3d86cf0842bff81da1ec2bc990ae84ed85b (patch) | |
tree | 934728de1baa655c150695acce5eee2e57a54ed3 | |
parent | Merge pull request #1648 from swaywm/swaybar-layers (diff) | |
download | sway-d6acb3d86cf0842bff81da1ec2bc990ae84ed85b.tar.gz sway-d6acb3d86cf0842bff81da1ec2bc990ae84ed85b.tar.zst sway-d6acb3d86cf0842bff81da1ec2bc990ae84ed85b.zip |
Set WAYLAND_DISPLAY earlier in startup
-rw-r--r-- | sway/server.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sway/server.c b/sway/server.c index 75202df2..3fba019d 100644 --- a/sway/server.c +++ b/sway/server.c | |||
@@ -102,12 +102,11 @@ void server_fini(struct sway_server *server) { | |||
102 | void server_run(struct sway_server *server) { | 102 | void server_run(struct sway_server *server) { |
103 | wlr_log(L_INFO, "Running compositor on wayland display '%s'", | 103 | wlr_log(L_INFO, "Running compositor on wayland display '%s'", |
104 | server->socket); | 104 | server->socket); |
105 | setenv("_WAYLAND_DISPLAY", server->socket, true); | 105 | setenv("WAYLAND_DISPLAY", server->socket, true); |
106 | if (!wlr_backend_start(server->backend)) { | 106 | if (!wlr_backend_start(server->backend)) { |
107 | wlr_log(L_ERROR, "Failed to start backend"); | 107 | wlr_log(L_ERROR, "Failed to start backend"); |
108 | wlr_backend_destroy(server->backend); | 108 | wlr_backend_destroy(server->backend); |
109 | return; | 109 | return; |
110 | } | 110 | } |
111 | setenv("WAYLAND_DISPLAY", server->socket, true); | ||
112 | wl_display_run(server->wl_display); | 111 | wl_display_run(server->wl_display); |
113 | } | 112 | } |