xserver: Set DISPLAY for clients launched by the compositor
diff --git a/src/compositor.c b/src/compositor.c
index 200e26c..4a5e51c 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -2117,12 +2117,12 @@
ec->option_idle_time = option_idle_time;
ec->idle_time = option_idle_time;
- if (shell_init(ec) < 0)
- exit(EXIT_FAILURE);
-
if (xserver)
weston_xserver_init(ec);
+ if (shell_init(ec) < 0)
+ exit(EXIT_FAILURE);
+
if (wl_display_add_socket(display, option_socket_name)) {
fprintf(stderr, "failed to add socket: %m\n");
exit(EXIT_FAILURE);