aboutsummaryrefslogtreecommitdiff
path: root/cmd-new-session.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2016-03-05 10:01:09 +0000
committerThomas Adam <thomas@xteddy.org>2016-03-05 10:01:09 +0000
commit81f78f0da7f72b4707f653d70615c7b64c341d44 (patch)
tree4026db58b521b20d6e191c434167d839d6fa56c6 /cmd-new-session.c
parent6c35d17800b5d745272c45bb4c71bde80780c415 (diff)
parentc38e0a4bbc722865f934db1282ca6f086874f530 (diff)
downloadrtmux-81f78f0da7f72b4707f653d70615c7b64c341d44.tar.gz
rtmux-81f78f0da7f72b4707f653d70615c7b64c341d44.tar.bz2
rtmux-81f78f0da7f72b4707f653d70615c7b64c341d44.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-new-session.c')
-rw-r--r--cmd-new-session.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd-new-session.c b/cmd-new-session.c
index 291107bc..357ffed1 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -142,7 +142,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
format_defaults(ft, c, NULL, NULL, NULL);
to_free = cwd = format_expand(ft, args_get(args, 'c'));
format_free(ft);
- } else if (c != NULL && c->session == NULL)
+ } else if (c != NULL && c->session == NULL && c->cwd != NULL)
cwd = c->cwd;
else
cwd = ".";