mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 18:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
startup: move setenv WAYLAND_DISPLAY before config execs
This commit is contained in:
emersion 2018-07-04 09:21:10 +01:00 committed by GitHub
parent 8cc26130a6 c092f1fe6a
commit 39534a1a61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sway/main.c
View file

@ -416,6 +416,7 @@ int main(int argc, char **argv) {
security_sanity_check(); security_sanity_check();
config->active = true; config->active = true;
setenv("WAYLAND_DISPLAY", server.socket, true);
// Execute commands until there are none left // Execute commands until there are none left
while (config->cmd_queue->length) { while (config->cmd_queue->length) {
char *line = config->cmd_queue->items[0]; char *line = config->cmd_queue->items[0];

1
sway/server.c
View file

@ -143,7 +143,6 @@ 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);
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);