From 513398253e9d8618f264445583ca9afee9c55896 Mon Sep 17 00:00:00 2001
From: Aidan Epstein <aidan@jmad.org>
Date: Sun, 5 Aug 2018 19:40:08 -0700
Subject: [PATCH] Use the env var for finding a socket.

---
 sway/server.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/sway/server.c b/sway/server.c
index f06173d1b..4aa1d4c54 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -141,8 +141,15 @@ bool server_init(struct sway_server *server) {
 	wlr_export_dmabuf_manager_v1_create(server->wl_display);
 	wlr_screencopy_manager_v1_create(server->wl_display);
 
-	server->socket = wl_display_add_socket_auto(server->wl_display);
-	if (!server->socket) {
+	server->socket = getenv("WAYLAND_DISPLAY");
+	int ret = 0;
+	if (server->socket) {
+		ret = wl_display_add_socket(server->wl_display, server->socket);
+	}
+	else {
+		server->socket = wl_display_add_socket_auto(server->wl_display);
+	}
+	if (ret < 0 || !server->socket) {
 		wlr_log(WLR_ERROR, "Unable to open wayland socket");
 		wlr_backend_destroy(server->backend);
 		return false;