Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-01-06 14:01:15 +00:00
11 changed files with 259 additions and 129 deletions

View File

@ -99,7 +99,7 @@ cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item)
if (c != NULL && c->session == NULL && c->cwd != NULL)
cwd = c->cwd;
else if ((s = c->session) != NULL && s->cwd != NULL)
else if (c != NULL && (s = c->session) != NULL && s->cwd != NULL)
cwd = s->cwd;
else
cwd = ".";