Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2020-03-02 23:09:48 +00:00
2 changed files with 245 additions and 19 deletions

View File

@ -228,9 +228,9 @@ spawn_pane(struct spawn_context *sc, char **cause)
* the pane's stored one unless specified.
*/
if (sc->cwd != NULL)
cwd = format_single(item, sc->cwd, c, s, NULL, NULL);
cwd = format_single(item, sc->cwd, c, item->target.s, NULL, NULL);
else if (~sc->flags & SPAWN_RESPAWN)
cwd = xstrdup(server_client_get_cwd(c, s));
cwd = xstrdup(server_client_get_cwd(c, item->target.s));
else
cwd = NULL;