diff options
author | Thomas Adam <thomas@xteddy.org> | 2017-09-10 11:39:45 +0100 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2017-09-10 11:39:45 +0100 |
commit | 7f83b53027c98589b516c4137a2fbc48a70e230b (patch) | |
tree | 87ea32d30c8dc7f8844e0f9d19a99e967fb92d2c /cmd-set-option.c | |
parent | c62cfe64c8aabd91ea977950b63a3bc956015143 (diff) | |
parent | 8405fcdd9b62e22003923a22edfefdaf42883a98 (diff) | |
download | rtmux-7f83b53027c98589b516c4137a2fbc48a70e230b.tar.gz rtmux-7f83b53027c98589b516c4137a2fbc48a70e230b.tar.bz2 rtmux-7f83b53027c98589b516c4137a2fbc48a70e230b.zip |
Merge branch 'obsd-master'
Conflicts:
server-client.c
Diffstat (limited to 'cmd-set-option.c')
-rw-r--r-- | cmd-set-option.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd-set-option.c b/cmd-set-option.c index 02504d5c..d1ec6fcf 100644 --- a/cmd-set-option.c +++ b/cmd-set-option.c @@ -190,7 +190,7 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item) /* Change the option. */ if (args_has(args, 'u')) { if (o == NULL) - goto fail; + goto out; if (idx == -1) { if (oo == global_options || oo == global_s_options || |