From c38e0a4bbc722865f934db1282ca6f086874f530 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 5 Mar 2016 07:47:52 +0000
Subject: Do not use c->cwd or s->cwd if it is NULL, found by Ben Boeckel.

---
 cmd-new-session.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/cmd-new-session.c b/cmd-new-session.c
index 291107bc..357ffed1 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -142,7 +142,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
 		format_defaults(ft, c, NULL, NULL, NULL);
 		to_free = cwd = format_expand(ft, args_get(args, 'c'));
 		format_free(ft);
-	} else if (c != NULL && c->session == NULL)
+	} else if (c != NULL && c->session == NULL && c->cwd != NULL)
 		cwd = c->cwd;
 	else
 		cwd = ".";
-- 
cgit