circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 13:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Handle NULL window or session for user options.

Browse Source
This commit is contained in:
nicm
2016-10-09 07:58:35 +00:00
parent 44449b305b
commit 48dd250af1
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cmd-set-option.c
View File

@ -232,6 +232,7 @@ cmd_set_option_user(struct cmd *self, struct cmd_q *cmdq, const char *optstr,
struct winlink *wl = cmdq->state.tflag.wl; struct winlink *wl = cmdq->state.tflag.wl;
struct options *oo; struct options *oo;
struct options_entry *o; struct options_entry *o;
const char *target;
if (args_has(args, 's')) if (args_has(args, 's'))
oo = global_options; oo = global_options;
@ -239,12 +240,28 @@ cmd_set_option_user(struct cmd *self, struct cmd_q *cmdq, const char *optstr,
self->entry == &cmd_set_window_option_entry) { self->entry == &cmd_set_window_option_entry) {
if (args_has(self->args, 'g')) if (args_has(self->args, 'g'))
oo = global_w_options; oo = global_w_options;
else else if (wl == NULL) {
target = args_get(args, 't');
if (target != NULL) {
cmdq_error(cmdq, "no such window: %s",
target);
} else
cmdq_error(cmdq, "no current window");
return (CMD_RETURN_ERROR);
} else
oo = wl->window->options; oo = wl->window->options;
} else { } else {
if (args_has(self->args, 'g')) if (args_has(self->args, 'g'))
oo = global_s_options; oo = global_s_options;
else else if (s == NULL) {
target = args_get(args, 't');
if (target != NULL) {
cmdq_error(cmdq, "no such session: %s",
target);
} else
cmdq_error(cmdq, "no current session");
return (CMD_RETURN_ERROR);
} else
oo = s->options; oo = s->options;
} }