diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-04-03 09:02:41 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-04-03 09:02:41 +0100 |
| commit | cb039b986ec2400439410a1cf983bd0a5ef4f9ca (patch) | |
| tree | 6be857786a1f7d44940b53c7b03ce58b466bf6c6 /cfg.c | |
| parent | c9ef144dcacb03645e04f262e107618fb103a7c1 (diff) | |
| parent | f6c54f3f03353c415cfc59a65118f570972d51ff (diff) | |
| download | rtmux-cb039b986ec2400439410a1cf983bd0a5ef4f9ca.tar.gz rtmux-cb039b986ec2400439410a1cf983bd0a5ef4f9ca.tar.bz2 rtmux-cb039b986ec2400439410a1cf983bd0a5ef4f9ca.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cfg.c')
| -rw-r--r-- | cfg.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -101,7 +101,8 @@ start_cfg(void) 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); |