aboutsummaryrefslogtreecommitdiff
path: root/cmd-select-layout.c
diff options
context:
space:
mode:
authorJosh Rahm <rahm@google.com>2022-07-21 15:53:59 -0600
committerJosh Rahm <rahm@google.com>2022-07-21 15:53:59 -0600
commitb11548e3db4361cd8312ffbd27472823bdab4d62 (patch)
treea84b5cf79fb41bb60b6495c1a346bb360b224604 /cmd-select-layout.c
parent88ebf5544e995d85b2f1416a216ac7f44f719eed (diff)
parentab1d18d00febe161080b8e81331861481110809f (diff)
downloadrtmux-b11548e3db4361cd8312ffbd27472823bdab4d62.tar.gz
rtmux-b11548e3db4361cd8312ffbd27472823bdab4d62.tar.bz2
rtmux-b11548e3db4361cd8312ffbd27472823bdab4d62.zip
Merge remote-tracking branch 'origin/master' into rahm
Diffstat (limited to 'cmd-select-layout.c')
-rw-r--r--cmd-select-layout.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/cmd-select-layout.c b/cmd-select-layout.c
index c857a0e1..6dfe2b6a 100644
--- a/cmd-select-layout.c
+++ b/cmd-select-layout.c
@@ -77,7 +77,7 @@ cmd_select_layout_exec(struct cmd *self, struct cmdq_item *item)
struct window *w = wl->window;
struct window_pane *wp = target->wp;
const char *layoutname;
- char *oldlayout;
+ char *oldlayout, *cause;
int next, previous, layout;
server_unzoom_window(w);
@@ -124,8 +124,9 @@ cmd_select_layout_exec(struct cmd *self, struct cmdq_item *item)
}
if (layoutname != NULL) {
- if (layout_parse(w, layoutname) == -1) {
- cmdq_error(item, "can't set layout: %s", layoutname);
+ if (layout_parse(w, layoutname, &cause) == -1) {
+ cmdq_error(item, "%s: %s", cause, layoutname);
+ free(cause);
goto error;
}
goto changed;