From dd4bdf1f56ab8b94da834cf8d3100e9baae9a2ea Mon Sep 17 00:00:00 2001
From: Calvin Lee <cyrus296@gmail.com>
Date: Tue, 3 Oct 2017 22:42:10 -0600
Subject: [PATCH] Unset $DISPLAY until XWayland is ready

---
 xwayland/xwayland.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c
index d3bb41a0f..2bec1b637 100644
--- a/xwayland/xwayland.c
+++ b/xwayland/xwayland.c
@@ -215,6 +215,10 @@ static bool wlr_xwayland_init(struct wlr_xwayland *wlr_xwayland,
 		wlr_xwayland_finish(wlr_xwayland);
 		return false;
 	}
+
+	// unset $DISPLAY while XWayland starts
+	unsetenv("DISPLAY");
+
 	wlr_xwayland->wl_fd[0] = -1; /* not ours anymore */
 
 	wlr_xwayland->destroy_listener.notify = xwayland_destroy_event;