From 911ef4e69a483d11045551628971761e8d1ecc22 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Fri, 22 Feb 2013 22:57:26 +0000 Subject: Allow display-message with no curclient. --- cmd-display-message.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cmd-display-message.c') diff --git a/cmd-display-message.c b/cmd-display-message.c index 244c557c..8bcd43f9 100644 --- a/cmd-display-message.c +++ b/cmd-display-message.c @@ -55,8 +55,7 @@ cmd_display_message_exec(struct cmd *self, struct cmd_ctx *ctx) time_t t; size_t len; - if ((c = cmd_find_client(ctx, args_get(args, 'c'))) == NULL) - return (CMD_RETURN_ERROR); + c = cmd_find_client(ctx, args_get(args, 'c')); if (args_has(args, 't')) { wl = cmd_find_pane(ctx, args_get(args, 't'), &s, &wp); @@ -80,7 +79,8 @@ cmd_display_message_exec(struct cmd *self, struct cmd_ctx *ctx) template = DISPLAY_MESSAGE_TEMPLATE; ft = format_create(); - format_client(ft, c); + if (c != NULL) + format_client(ft, c); format_session(ft, s); format_winlink(ft, s, wl); format_window_pane(ft, wp); -- cgit From 3a2e9d805a80e683078994d86a5390bf5deed9fc Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Fri, 22 Feb 2013 23:04:53 +0000 Subject: Fix error reporting for client commands by adding a flag to cmd_find_client to tell it whether or not to show errors, sometimes it's needed and sometimes not. --- cmd-display-message.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'cmd-display-message.c') diff --git a/cmd-display-message.c b/cmd-display-message.c index 8bcd43f9..f0cd66c0 100644 --- a/cmd-display-message.c +++ b/cmd-display-message.c @@ -55,8 +55,6 @@ cmd_display_message_exec(struct cmd *self, struct cmd_ctx *ctx) time_t t; size_t len; - c = cmd_find_client(ctx, args_get(args, 'c')); - if (args_has(args, 't')) { wl = cmd_find_pane(ctx, args_get(args, 't'), &s, &wp); if (wl == NULL) @@ -79,7 +77,7 @@ cmd_display_message_exec(struct cmd *self, struct cmd_ctx *ctx) template = DISPLAY_MESSAGE_TEMPLATE; ft = format_create(); - if (c != NULL) + if ((c = cmd_find_client(ctx, args_get(args, 'c'), 1)) != NULL) format_client(ft, c); format_session(ft, s); format_winlink(ft, s, wl); -- cgit