diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-02-21 08:03:42 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-02-21 08:03:42 +0000 |
| commit | c310212d28947f35595d945936e04148a39246d8 (patch) | |
| tree | 93447903c46b28e0bafe6fa234dc245d72bd00a0 /cmd-set-option.c | |
| parent | 94d99d54629b182a4266d918ccf80e4daee4567b (diff) | |
| parent | 9120df33efdbaac82c152ed3d5995e2be7a70411 (diff) | |
| download | rtmux-c310212d28947f35595d945936e04148a39246d8.tar.gz rtmux-c310212d28947f35595d945936e04148a39246d8.tar.bz2 rtmux-c310212d28947f35595d945936e04148a39246d8.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'cmd-set-option.c')
| -rw-r--r-- | cmd-set-option.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmd-set-option.c b/cmd-set-option.c index 15b14f08..5ae4e5c3 100644 --- a/cmd-set-option.c +++ b/cmd-set-option.c @@ -307,11 +307,13 @@ cmd_set_option_set(struct cmd *self, struct cmd_q *cmdq, break; case OPTIONS_TABLE_COLOUR: o = cmd_set_option_colour(self, cmdq, oe, oo, value); - style_update_new(oo, o->name, oe->style); + if (o != NULL) + style_update_new(oo, o->name, oe->style); break; case OPTIONS_TABLE_ATTRIBUTES: o = cmd_set_option_attributes(self, cmdq, oe, oo, value); - style_update_new(oo, o->name, oe->style); + if (o != NULL) + style_update_new(oo, o->name, oe->style); break; case OPTIONS_TABLE_FLAG: o = cmd_set_option_flag(self, cmdq, oe, oo, value); |