From b9a6162d2f9bea63c3ad421e9c3969eea2852b00 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 24 May 2018 09:42:49 +0000
Subject: Make server_client_get_cwd used (almost) everywhere we need to work
 out the cwd, and do not fall back to "." as it is pretty useless. GitHub
 issue 1331.

---
 cmd-new-session.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'cmd-new-session.c')

diff --git a/cmd-new-session.c b/cmd-new-session.c
index 26cb08ba..7af67a11 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -156,10 +156,8 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
 	/* Get the new session working directory. */
 	if ((tmp = args_get(args, 'c')) != NULL)
 		cwd = format_single(item, tmp, c, NULL, NULL, NULL);
-	else if (c != NULL && c->session == NULL && c->cwd != NULL)
-		cwd = xstrdup(c->cwd);
 	else
-		cwd = xstrdup(".");
+		cwd = xstrdup(server_client_get_cwd(c, NULL));
 
 	/*
 	 * If this is a new client, check for nesting and save the termios
-- 
cgit