blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #202 from 4e554c4c/unsetenv 

Unset $DISPLAY until XWayland is ready
This commit is contained in:
Drew DeVault 2017-10-04 10:14:32 -04:00 committed by GitHub
parent 836242b0c4 dd4bdf1f56
commit edadbc7c7f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xwayland/xwayland.c
View File

@ -215,6 +215,10 @@ static bool wlr_xwayland_init(struct wlr_xwayland *wlr_xwayland,
wlr_xwayland_finish(wlr_xwayland); wlr_xwayland_finish(wlr_xwayland);
return false; return false;
} }
// unset $DISPLAY while XWayland starts
unsetenv("DISPLAY");
wlr_xwayland->wl_fd[0] = -1; /* not ours anymore */ wlr_xwayland->wl_fd[0] = -1; /* not ours anymore */
wlr_xwayland->destroy_listener.notify = xwayland_destroy_event; wlr_xwayland->destroy_listener.notify = xwayland_destroy_event;