aboutsummaryrefslogtreecommitdiff
path: root/cmd-set-option.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-07-27 10:01:08 +0100
committerThomas Adam <thomas@xteddy.org>2015-07-27 10:01:08 +0100
commitff18787b2c9da49e1ab80fc04a7e66224b96f1fc (patch)
tree9d1d9582fc043d35ef64e292dd3861726802add2 /cmd-set-option.c
parente4cdc9fa0b00d6fc691afcf2fc3f727e60dfe94c (diff)
parentd33adc4fd0f7657ede3178c9b1f33c2d5df3c524 (diff)
downloadrtmux-ff18787b2c9da49e1ab80fc04a7e66224b96f1fc.tar.gz
rtmux-ff18787b2c9da49e1ab80fc04a7e66224b96f1fc.tar.bz2
rtmux-ff18787b2c9da49e1ab80fc04a7e66224b96f1fc.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-set-option.c')
-rw-r--r--cmd-set-option.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/cmd-set-option.c b/cmd-set-option.c
index 77c7d7c2..761cee93 100644
--- a/cmd-set-option.c
+++ b/cmd-set-option.c
@@ -110,8 +110,11 @@ cmd_set_option_exec(struct cmd *self, struct cmd_q *cmdq)
/* Find the option entry, try each table. */
table = oe = NULL;
if (options_table_find(optstr, &table, &oe) != 0) {
- cmdq_error(cmdq, "ambiguous option: %s", optstr);
- return (CMD_RETURN_ERROR);
+ if (!args_has(args, 'q')) {
+ cmdq_error(cmdq, "ambiguous option: %s", optstr);
+ return (CMD_RETURN_ERROR);
+ }
+ return (CMD_RETURN_NORMAL);
}
if (oe == NULL) {
if (!args_has(args, 'q')) {