summaryrefslogtreecommitdiffstats
path: root/cfg.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-01-16 00:01:10 +0000
committerThomas Adam <thomas@xteddy.org>2017-01-16 00:01:10 +0000
commit7b606457320995e2f4790b758a13d26d383ae213 (patch)
treee57056522b598aee1c15e88ce8607052aa97b7a3 /cfg.c
parentc9fcb76651cd6685ad33b845bcd0a21771964d37 (diff)
parent52847a951802fda7a3ce36cdac77c34914b0ccca (diff)
Merge branch 'obsd-master'
Diffstat (limited to 'cfg.c')
-rw-r--r--cfg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/cfg.c b/cfg.c
index ce80c142..f59a0842 100644
--- a/cfg.c
+++ b/cfg.c
@@ -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;