=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cfg.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- src/usr.bin/tmux/cfg.c 2019/03/12 11:16:49 1.66 +++ src/usr.bin/tmux/cfg.c 2019/04/03 06:43:19 1.67 @@ -1,4 +1,4 @@ -/* $OpenBSD: cfg.c,v 1.66 2019/03/12 11:16:49 nicm Exp $ */ +/* $OpenBSD: cfg.c,v 1.67 2019/04/03 06:43:19 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott @@ -102,7 +102,8 @@ cmdq_append(c, cfg_item); } - load_cfg(TMUX_CONF, NULL, NULL, 1); + if (cfg_file == NULL) + load_cfg(TMUX_CONF, NULL, NULL, 1); if (cfg_file == NULL && (home = find_home()) != NULL) { xasprintf(&cfg_file, "%s/.tmux.conf", home);