circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 09:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Don't boke when figuring out working directory from configuration file.

Browse Source
This commit is contained in:
nicm
2013-10-10 12:28:38 +00:00
parent 7936ce3874
commit 909e1c1a86
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-new-session.c
View File

@@ -115,7 +115,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
} }
cwd = fd; cwd = fd;
} else if (c->session == NULL) } else if (c != NULL && c->session == NULL)
cwd = c->cwd; cwd = c->cwd;
else if ((c0 = cmd_current_client(cmdq)) != NULL) else if ((c0 = cmd_current_client(cmdq)) != NULL)
cwd = c0->session->cwd; cwd = c0->session->cwd;

2
cmd-new-window.c
View File

@@ -125,7 +125,7 @@ cmd_new_window_exec(struct cmd *self, struct cmd_q *cmdq)
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
} }
cwd = fd; cwd = fd;
} else if (cmdq->client->session == NULL) } else if (cmdq->client != NULL && cmdq->client->session == NULL)
cwd = cmdq->client->cwd; cwd = cmdq->client->cwd;
else else
cwd = s->cwd; cwd = s->cwd;

2
cmd-split-window.c
View File

@@ -103,7 +103,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
} }
cwd = fd; cwd = fd;
} else if (cmdq->client->session == NULL) } else if (cmdq->client != NULL && cmdq->client->session == NULL)
cwd = cmdq->client->cwd; cwd = cmdq->client->cwd;
else else
cwd = s->cwd; cwd = s->cwd;