xserver: Only launch wm for xservers we launch

2011-07-20 18:15:27 -07:00 · 2011-07-20 18:15:27 -07:00 · 4a431477ec
parent 86ec8e80d8
commit 4a431477ec
1 changed files with 5 additions and 0 deletions
--- 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");