circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-03 06:18:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2019-02-16 14:02:37 +00:00
commit fa8294436c
3 changed files with 5 additions and 1 deletions

3
cfg.c
View File

@ -37,6 +37,7 @@ struct cfg_cond {
}; };
TAILQ_HEAD(cfg_conds, cfg_cond); TAILQ_HEAD(cfg_conds, cfg_cond);
struct client *cfg_client;
static char *cfg_file; static char *cfg_file;
int cfg_finished; int cfg_finished;
static char **cfg_causes; static char **cfg_causes;
@ -94,7 +95,7 @@ start_cfg(void)
* command queue is currently empty and our callback will be at the * command queue is currently empty and our callback will be at the
* front - we need to get in before MSG_COMMAND. * front - we need to get in before MSG_COMMAND.
*/ */
c = TAILQ_FIRST(&clients); cfg_client = c = TAILQ_FIRST(&clients);
if (c != NULL) { if (c != NULL) {
cfg_item = cmdq_get_callback(cfg_client_done, NULL); cfg_item = cmdq_get_callback(cfg_client_done, NULL);
cmdq_append(c, cfg_item); cmdq_append(c, cfg_item);

2
server-client.c
View File

@ -1996,6 +1996,8 @@ server_client_get_cwd(struct client *c, struct session *s)
{ {
const char *home; const char *home;
if (!cfg_finished && cfg_client != NULL)
return (cfg_client->cwd);
if (c != NULL && c->session == NULL && c->cwd != NULL) if (c != NULL && c->session == NULL && c->cwd != NULL)
return (c->cwd); return (c->cwd);
if (s != NULL && s->cwd != NULL) if (s != NULL && s->cwd != NULL)

1
tmux.h
View File

@ -1529,6 +1529,7 @@ void proc_toggle_log(struct tmuxproc *);
/* cfg.c */ /* cfg.c */
extern int cfg_finished; extern int cfg_finished;
extern struct client *cfg_client;
void start_cfg(void); void start_cfg(void);
int load_cfg(const char *, struct client *, struct cmdq_item *, int); int load_cfg(const char *, struct client *, struct cmdq_item *, int);
void set_cfg_file(const char *); void set_cfg_file(const char *);