From 33d7509d374ae649f2684d62bbe7faa5bc42687c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Mon, 13 Aug 2012 13:56:03 -0400
Subject: [PATCH] compositor: Set WAYLAND_DISPLAY only after creating backend

The wayland backend needs to connect to the original WAYLAND_DISPLAY
before we overwrite it.

https://bugs.freedesktop.org/show_bug.cgi?id=53064
---
 src/compositor.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/compositor.c b/src/compositor.c
index 30a1f4f9..6e8afb69 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -3535,8 +3535,6 @@ int main(int argc, char *argv[])
 
 	config_file = config_file_path("weston.ini");
 	parse_config_file(config_file, cs, ARRAY_LENGTH(cs), shell);
-	if (socket_name)
-		setenv("WAYLAND_DISPLAY", socket_name, 1);
 
 	backend_init = load_module(backend, "backend_init", &backend_module);
 	if (!backend_init)
@@ -3576,6 +3574,9 @@ int main(int argc, char *argv[])
 		goto out;
 	}
 
+	if (socket_name)
+		setenv("WAYLAND_DISPLAY", socket_name, 1);
+
 	if (!shell)
 		shell = "desktop-shell.so";
 	module_init = load_module(shell, "shell_init", &shell_module);