aboutsummaryrefslogtreecommitdiff
path: root/cmd-set-option.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2014-02-19 15:05:07 +0000
committerThomas Adam <thomas@xteddy.org>2014-02-19 15:05:07 +0000
commitca1d78f5230e0c3ab4c3b15fff2597fbdb037b48 (patch)
treea9e33fd328e948a4ef9a57d6cc2fe3d82cbf128c /cmd-set-option.c
parentb3de4a3dec85bc84bb83da6b46e2a8e2a634ace3 (diff)
parent6daf06b1ad61f67e9f7780d787451b9b5f82dd43 (diff)
downloadrtmux-ca1d78f5230e0c3ab4c3b15fff2597fbdb037b48.tar.gz
rtmux-ca1d78f5230e0c3ab4c3b15fff2597fbdb037b48.tar.bz2
rtmux-ca1d78f5230e0c3ab4c3b15fff2597fbdb037b48.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-set-option.c')
-rw-r--r--cmd-set-option.c6
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);