diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-05-15 16:50:15 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-05-15 16:50:15 +0100 |
| commit | 907ad00300506c25ee84223811e25a411dc21517 (patch) | |
| tree | ec84d431722e22820564b77157df41c11ccc25be /server.c | |
| parent | 5b1cf02f2ea224922661495af32d46b024e28eef (diff) | |
| parent | fce095665c62eb38826f42ae55a0fbe998f18be0 (diff) | |
| download | rtmux-907ad00300506c25ee84223811e25a411dc21517.tar.gz rtmux-907ad00300506c25ee84223811e25a411dc21517.tar.bz2 rtmux-907ad00300506c25ee84223811e25a411dc21517.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Conflicts:
Makefile.am
Diffstat (limited to 'server.c')
| -rw-r--r-- | server.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -170,13 +170,13 @@ server_start(int lockfd, char *lockfile) cfg_references = 1; ARRAY_INIT(&cfg_causes); - if (access(SYSTEM_CFG, R_OK) == 0) { - if (load_cfg(SYSTEM_CFG, cfg_cmd_q, &cause) == -1) { - xasprintf(&cause, "%s: %s", SYSTEM_CFG, cause); + if (access(TMUX_CONF, R_OK) == 0) { + if (load_cfg(TMUX_CONF, cfg_cmd_q, &cause) == -1) { + xasprintf(&cause, "%s: %s", TMUX_CONF, cause); ARRAY_ADD(&cfg_causes, cause); } } else if (errno != ENOENT) { - xasprintf(&cause, "%s: %s", SYSTEM_CFG, strerror(errno)); + xasprintf(&cause, "%s: %s", TMUX_CONF, strerror(errno)); ARRAY_ADD(&cfg_causes, cause); } if (cfg_file != NULL) { |