From af272f2685e2ef92248155d3ad3db200d956b001 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 1 Apr 2014 20:00:20 -0400 Subject: [PATCH] xwayland: Move global initialization down --- src/wayland/meta-xwayland.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c index aa4b24df5..543e8ffbc 100644 --- a/src/wayland/meta-xwayland.c +++ b/src/wayland/meta-xwayland.c @@ -299,10 +299,6 @@ meta_xwayland_start (MetaXWaylandManager *manager, char **env; char *fd_string; - wl_global_create (wl_display, &xserver_interface, - META_XSERVER_VERSION, - manager, bind_xserver); - do { lockfile = create_lockfile (display, &display); @@ -341,6 +337,10 @@ meta_xwayland_start (MetaXWaylandManager *manager, manager->display_index = display; manager->lockfile = lockfile; + wl_global_create (wl_display, &xserver_interface, + META_XSERVER_VERSION, + manager, bind_xserver); + /* We want xwayland to be a wayland client so we make a socketpair to setup a * wayland protocol connection. */ if (socketpair (AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sp) < 0)