diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-05-20 15:02:40 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-05-20 15:02:40 +0100 |
| commit | 98ee93bde39b608fbcdca3b246b7d2088740f7cb (patch) | |
| tree | 8772ddfccea6237ae2b6635ef192ef39fe2b82e7 /cmd-display-panes.c | |
| parent | 3a7e15511ba3353588cdf61c0d195699bcb0dcbc (diff) | |
| parent | 87d82170a615007bbd2f880765f222dd5c263000 (diff) | |
| download | rtmux-98ee93bde39b608fbcdca3b246b7d2088740f7cb.tar.gz rtmux-98ee93bde39b608fbcdca3b246b7d2088740f7cb.tar.bz2 rtmux-98ee93bde39b608fbcdca3b246b7d2088740f7cb.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-display-panes.c')
| -rw-r--r-- | cmd-display-panes.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/cmd-display-panes.c b/cmd-display-panes.c index 8940b429..6e331ae1 100644 --- a/cmd-display-panes.c +++ b/cmd-display-panes.c @@ -182,17 +182,6 @@ cmd_display_panes_draw(struct client *c, struct screen_redraw_ctx *ctx) } } -static enum cmd_retval -cmd_display_panes_error(struct cmdq_item *item, void *data) -{ - char *error = data; - - cmdq_error(item, "%s", error); - free(error); - - return (CMD_RETURN_NORMAL); -} - static void cmd_display_panes_free(struct client *c) { @@ -226,11 +215,13 @@ cmd_display_panes_key(struct client *c, struct key_event *event) cmd = cmd_template_replace(cdata->command, expanded, 1); cmdlist = cmd_string_parse(cmd, NULL, 0, &cause); - if (cmdlist == NULL && cause != NULL) - new_item = cmdq_get_callback(cmd_display_panes_error, cause); - else if (cmdlist == NULL) - new_item = NULL; - else { + if (cmdlist == NULL) { + if (cause != NULL) + new_item = cmdq_get_error(cause); + else + new_item = NULL; + free(cause); + } else { new_item = cmdq_get_command(cmdlist, NULL, NULL, 0); cmd_list_free(cmdlist); } |