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

compositor: Set WAYLAND_DISPLAY only after creating backend

Browse Source 
The wayland backend needs to connect to the original WAYLAND_DISPLAY
before we overwrite it.

https://bugs.freedesktop.org/show_bug.cgi?id=53064
This commit is contained in:
Kristian Høgsberg 2012-08-13 13:56:03 -04:00
parent 4272e63991
commit 33d7509d37
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/compositor.c
View File

@ -3535,8 +3535,6 @@ int main(int argc, char *argv[])
config_file = config_file_path("weston.ini");
parse_config_file(config_file, cs, ARRAY_LENGTH(cs), shell);
if (socket_name)
setenv("WAYLAND_DISPLAY", socket_name, 1);
backend_init = load_module(backend, "backend_init", &backend_module);
if (!backend_init)
@ -3576,6 +3574,9 @@ int main(int argc, char *argv[])
goto out;
}
if (socket_name)
setenv("WAYLAND_DISPLAY", socket_name, 1);
if (!shell)
shell = "desktop-shell.so";
module_init = load_module(shell, "shell_init", &shell_module);