aboutsummaryrefslogtreecommitdiff
path: root/control.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 /control.c
parentc9fcb76651cd6685ad33b845bcd0a21771964d37 (diff)
parent52847a951802fda7a3ce36cdac77c34914b0ccca (diff)
downloadrtmux-7b606457320995e2f4790b758a13d26d383ae213.tar.gz
rtmux-7b606457320995e2f4790b758a13d26d383ae213.tar.bz2
rtmux-7b606457320995e2f4790b758a13d26d383ae213.zip
Merge branch 'obsd-master'
Diffstat (limited to 'control.c')
-rw-r--r--control.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/control.c b/control.c
index e9b1e8ea..64e9fec1 100644
--- a/control.c
+++ b/control.c
@@ -85,7 +85,8 @@ control_callback(struct client *c, int closed, __unused void *data)
break;
}
- if (cmd_string_parse(line, &cmdlist, NULL, 0, &cause) != 0) {
+ cmdlist = cmd_string_parse(line, NULL, 0, &cause);
+ if (cmdlist == NULL) {
item = cmdq_get_callback(control_error, cause);
cmdq_append(c, item);
} else {