diff options
| author | Thomas Adam <thomas@xteddy.org> | 2018-05-24 13:02:29 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2018-05-24 13:02:29 +0100 |
| commit | 7448b38327f856dae6ce915eae63f7f6c3f036e0 (patch) | |
| tree | e38b2964d8261f2103f633b26995d5d2d38c7b94 /cmd-run-shell.c | |
| parent | 85d5a377c53d711ff923f1b5f9184f2f96c29c41 (diff) | |
| parent | b9a6162d2f9bea63c3ad421e9c3969eea2852b00 (diff) | |
| download | rtmux-7448b38327f856dae6ce915eae63f7f6c3f036e0.tar.gz rtmux-7448b38327f856dae6ce915eae63f7f6c3f036e0.tar.bz2 rtmux-7448b38327f856dae6ce915eae63f7f6c3f036e0.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-run-shell.c')
| -rw-r--r-- | cmd-run-shell.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/cmd-run-shell.c b/cmd-run-shell.c index 8de8736a..a9961988 100644 --- a/cmd-run-shell.c +++ b/cmd-run-shell.c @@ -90,14 +90,6 @@ cmd_run_shell_exec(struct cmd *self, struct cmdq_item *item) struct session *s = item->target.s; struct winlink *wl = item->target.wl; struct window_pane *wp = item->target.wp; - const char *cwd; - - if (item->client != NULL && item->client->session == NULL) - cwd = item->client->cwd; - else if (s != NULL) - cwd = s->cwd; - else - cwd = NULL; cdata = xcalloc(1, sizeof *cdata); cdata->cmd = format_single(item, args->argv[0], c, s, wl, wp); @@ -110,8 +102,8 @@ cmd_run_shell_exec(struct cmd *self, struct cmdq_item *item) if (!args_has(args, 'b')) cdata->item = item; - job_run(cdata->cmd, s, cwd, NULL, cmd_run_shell_callback, - cmd_run_shell_free, cdata, 0); + job_run(cdata->cmd, s, server_client_get_cwd(item->client, s), NULL, + cmd_run_shell_callback, cmd_run_shell_free, cdata, 0); if (args_has(args, 'b')) return (CMD_RETURN_NORMAL); |