aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2013-03-14 07:31:20 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2013-03-14 07:31:20 +0000
commit3d974b7267e1e9073930a065d7a0f206f3d975f6 (patch)
treeee70787fddec2ae2637ec8c9d217eae911546363
parentc5ad47ee7c7595c1d0dcf2a226742fd19d548605 (diff)
downloadrtmux-3d974b7267e1e9073930a065d7a0f206f3d975f6.tar.gz
rtmux-3d974b7267e1e9073930a065d7a0f206f3d975f6.tar.bz2
rtmux-3d974b7267e1e9073930a065d7a0f206f3d975f6.zip
Don't let display-message crash if no client, from George Nachman.
-rw-r--r--cmd-display-message.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd-display-message.c b/cmd-display-message.c
index 319280ba..4ff3f97f 100644
--- a/cmd-display-message.c
+++ b/cmd-display-message.c
@@ -90,7 +90,10 @@ cmd_display_message_exec(struct cmd *self, struct cmd_q *cmdq)
msg = format_expand(ft, out);
if (args_has(self->args, 'p'))
cmdq_print(cmdq, "%s", msg);
- else
+ else if (c == NULL) {
+ cmdq_error(cmdq, "no client available");
+ return (CMD_RETURN_ERROR);
+ } else
status_message_set(c, "%s", msg);
free(msg);
format_free(ft);