aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-09-03 14:01:18 +0100
committerThomas Adam <thomas@xteddy.org>2020-09-03 14:01:18 +0100
commit2e931d49940ed91e2d534e497c86838ebaae833d (patch)
treef21bca8490880352d383a0267dbffe60afefb723
parentcbbf5febff50d3e2231f2da8c843608e8cacf514 (diff)
parenteadf18b9fa3f32ffd06be5dbca627047430bc01c (diff)
downloadrtmux-2e931d49940ed91e2d534e497c86838ebaae833d.tar.gz
rtmux-2e931d49940ed91e2d534e497c86838ebaae833d.tar.bz2
rtmux-2e931d49940ed91e2d534e497c86838ebaae833d.zip
Merge branch 'obsd-master'
-rw-r--r--cmd-attach-session.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd-attach-session.c b/cmd-attach-session.c
index 38d9c024..6a7ebba7 100644
--- a/cmd-attach-session.c
+++ b/cmd-attach-session.c
@@ -59,7 +59,7 @@ cmd_attach_session(struct cmdq_item *item, const char *tflag, int dflag,
struct session *s;
struct winlink *wl;
struct window_pane *wp;
- char *cause;
+ char *cwd, *cause;
enum msgtype msgtype;
if (RB_EMPTY(&sessions)) {
@@ -99,8 +99,9 @@ cmd_attach_session(struct cmdq_item *item, const char *tflag, int dflag,
}
if (cflag != NULL) {
+ cwd = format_single(item, cflag, c, s, wl, wp);
free((void *)s->cwd);
- s->cwd = format_single(item, cflag, c, s, wl, wp);
+ s->cwd = cwd;
}
if (fflag)
server_client_set_flags(c, fflag);