mirror of
https://github.com/tmux/tmux.git
synced 2024-10-01 16:58:53 +00:00
Merge branch 'obsd-master'
This commit is contained in:
commit
2e931d4994
@ -59,7 +59,7 @@ cmd_attach_session(struct cmdq_item *item, const char *tflag, int dflag,
|
|||||||
struct session *s;
|
struct session *s;
|
||||||
struct winlink *wl;
|
struct winlink *wl;
|
||||||
struct window_pane *wp;
|
struct window_pane *wp;
|
||||||
char *cause;
|
char *cwd, *cause;
|
||||||
enum msgtype msgtype;
|
enum msgtype msgtype;
|
||||||
|
|
||||||
if (RB_EMPTY(&sessions)) {
|
if (RB_EMPTY(&sessions)) {
|
||||||
@ -99,8 +99,9 @@ cmd_attach_session(struct cmdq_item *item, const char *tflag, int dflag,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (cflag != NULL) {
|
if (cflag != NULL) {
|
||||||
|
cwd = format_single(item, cflag, c, s, wl, wp);
|
||||||
free((void *)s->cwd);
|
free((void *)s->cwd);
|
||||||
s->cwd = format_single(item, cflag, c, s, wl, wp);
|
s->cwd = cwd;
|
||||||
}
|
}
|
||||||
if (fflag)
|
if (fflag)
|
||||||
server_client_set_flags(c, fflag);
|
server_client_set_flags(c, fflag);
|
||||||
|
Loading…
Reference in New Issue
Block a user