circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 13:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2017-01-16 00:01:10 +00:00
parent c9fcb76651 52847a9518
commit 7b60645732
11 changed files with 31 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cfg.c
View File

@ -140,7 +140,8 @@ load_cfg(const char *path, struct client *c, struct cmdq_item *item, int quiet)
if (condition == -1)
continue;
if (cmd_string_parse(p, &cmdlist, path, line, &cause1) != 0) {
cmdlist = cmd_string_parse(p, path, line, &cause1);
if (cmdlist == NULL) {
free(buf);
if (cause1 == NULL)
continue;