nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Save environment-variable AFTER reading the configfile

next
Axel Wagner 2011-01-11 05:25:04 +01:00 committed by Michael Stapelberg
parent 4caf85aa0b
commit 92a038dd25
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.c
View File

@ -99,8 +99,6 @@ int main(int argc, char *argv[]) {
if (!isatty(fileno(stdout)))
setbuf(stdout, NULL);
config.ipc_socket_path = getenv("I3SOCK");
start_argv = argv;
while ((opt = getopt_long(argc, argv, "c:CvaL:hld:V", long_options, &option_index)) != -1) {
@ -180,6 +178,10 @@ int main(int argc, char *argv[]) {
exit(0);
}
if (config.ipc_socket_path == NULL) {
config.ipc_socket_path = getenv("I3SOCK");
}
xcb_screen_t *root_screen = xcb_aux_get_screen(conn, screens);
root = root_screen->root;
root_depth = root_screen->root_depth;