mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xserver: Only launch wm for xservers we launch

Browse Source
This commit is contained in:
Kristian Høgsberg
2011-07-20 18:15:27 -07:00
parent 86ec8e80d8
commit 4a431477ec
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/xserver-launcher.c
+5
View File
@@ -440,6 +440,11 @@ wlsc_xserver_bind(struct wl_client *client,
struct wlsc_xserver *wxs = struct wlsc_xserver *wxs =
container_of(global, struct wlsc_xserver, xserver.object); 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); wxs->wm = wlsc_wm_create(wxs);
if (wxs == NULL) { if (wxs == NULL) {
fprintf(stderr, "failed to create wm\n"); fprintf(stderr, "failed to create wm\n");