From 4a431477ecdacc8ea6fc69a897b5f0e3fa492583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Wed, 20 Jul 2011 18:15:27 -0700
Subject: [PATCH] xserver: Only launch wm for xservers we launch

---
 compositor/xserver-launcher.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/compositor/xserver-launcher.c b/compositor/xserver-launcher.c
index e89e45cf..fb953a2b 100644
--- a/compositor/xserver-launcher.c
+++ b/compositor/xserver-launcher.c
@@ -440,6 +440,11 @@ wlsc_xserver_bind(struct wl_client *client,
 	struct wlsc_xserver *wxs =
 		container_of(global, struct wlsc_xserver, xserver.object);
 
+	/* If it's a different client than the xserver we launched,
+	 * don't start the wm. */
+	if (client != wxs->client)
+		return;
+
 	wxs->wm = wlsc_wm_create(wxs);
 	if (wxs == NULL) {
 		fprintf(stderr, "failed to create wm\n");