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-load-buffer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cmd-load-buffer.c')

diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c
index 6fd2a767..de76b855 100644
--- a/cmd-load-buffer.c
+++ b/cmd-load-buffer.c
@@ -73,9 +73,9 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 		return (CMD_RETURN_WAIT);
 	}
 
-	if (c != NULL && c->session == NULL)
+	if (c != NULL && c->session == NULL && c->cwd != NULL)
 		cwd = c->cwd;
-	else if ((s = c->session) != NULL)
+	else if ((s = c->session) != NULL && s->cwd != NULL)
 		cwd = s->cwd;
 	else
 		cwd = ".";
-- 
cgit