diff options
author | Thomas Adam <thomas@xteddy.org> | 2019-02-16 14:02:37 +0000 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2019-02-16 14:02:37 +0000 |
commit | fa8294436c3acf64899e4af5fc46e0f8f5b02c40 (patch) | |
tree | fe8390e4ddd793a2b6cf7cc962ff15cd9abf875c /server-client.c | |
parent | 9768091ee448d7d3e54778a514ea89d3c809a141 (diff) | |
parent | 82f0c859a2bcdfac79d242793b7720b74d62d04b (diff) |
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
-rw-r--r-- | server-client.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/server-client.c b/server-client.c index dd1e8b81..e461e249 100644 --- a/server-client.c +++ b/server-client.c @@ -1996,6 +1996,8 @@ server_client_get_cwd(struct client *c, struct session *s) { const char *home; + if (!cfg_finished && cfg_client != NULL) + return (cfg_client->cwd); if (c != NULL && c->session == NULL && c->cwd != NULL) return (c->cwd); if (s != NULL && s->cwd != NULL) |