diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-03-02 18:10:51 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-03-02 18:10:51 +0000 |
| commit | e304673c65d774bb76e5d55c095c8c8e6b05ff91 (patch) | |
| tree | af461e71978b76dad59348d924a37f62b8c0bb7d /cmd-if-shell.c | |
| parent | e9d369a09e48ea8f940958025c8444988d31e840 (diff) | |
| parent | b8a102d26f41e57b94359627a4df8f22af10c6fa (diff) | |
| download | rtmux-e304673c65d774bb76e5d55c095c8c8e6b05ff91.tar.gz rtmux-e304673c65d774bb76e5d55c095c8c8e6b05ff91.tar.bz2 rtmux-e304673c65d774bb76e5d55c095c8c8e6b05ff91.zip | |
Merge branch 'obsd-master'
Conflicts:
utf8.c
Diffstat (limited to 'cmd-if-shell.c')
| -rw-r--r-- | cmd-if-shell.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd-if-shell.c b/cmd-if-shell.c index 229289cd..3e2a5251 100644 --- a/cmd-if-shell.c +++ b/cmd-if-shell.c @@ -73,14 +73,13 @@ cmd_if_shell_exec(struct cmd *self, struct cmd_q *cmdq) struct format_tree *ft; const char *cwd; - cwd = wp->cwd; - if (cmdq->client != NULL && cmdq->client->session == NULL) cwd = cmdq->client->cwd; else if (s != NULL) cwd = s->cwd; else cwd = NULL; + ft = format_create(cmdq, 0); format_defaults(ft, NULL, s, wl, wp); shellcmd = format_expand(ft, args->argv[0]); |