diff options
author | Thomas Adam <thomas@xteddy.org> | 2017-01-16 00:01:10 +0000 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2017-01-16 00:01:10 +0000 |
commit | 7b606457320995e2f4790b758a13d26d383ae213 (patch) | |
tree | e57056522b598aee1c15e88ce8607052aa97b7a3 /cfg.c | |
parent | c9fcb76651cd6685ad33b845bcd0a21771964d37 (diff) | |
parent | 52847a951802fda7a3ce36cdac77c34914b0ccca (diff) | |
download | rtmux-7b606457320995e2f4790b758a13d26d383ae213.tar.gz rtmux-7b606457320995e2f4790b758a13d26d383ae213.tar.bz2 rtmux-7b606457320995e2f4790b758a13d26d383ae213.zip |
Merge branch 'obsd-master'
Diffstat (limited to 'cfg.c')
-rw-r--r-- | cfg.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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; |