Do not crash when the current session has no window, fixes a bug

reported by Giorgio Lando. Fix from Thomas Adam.
This commit is contained in:
Nicholas Marriott 2012-06-18 09:20:19 +00:00
parent 2113115cdd
commit a4a2c68fa9
1 changed files with 2 additions and 2 deletions

4
cmd.c
View File

@ -1290,7 +1290,7 @@ cmd_get_default_path(struct cmd_ctx *ctx, const char *cwd)
/* Session working directory. */
root = s->cwd;
goto complete_path;
} else if (cwd[0] == '.' && (cwd[1] == '\0' || cwd[1] == '/')){
} else if (cwd[0] == '.' && (cwd[1] == '\0' || cwd[1] == '/')) {
/* Server working directory. */
if (getcwd(tmp, sizeof tmp) != NULL) {
root = tmp;
@ -1304,7 +1304,7 @@ cmd_get_default_path(struct cmd_ctx *ctx, const char *cwd)
/* Empty or relative path. */
if (ctx->cmdclient != NULL && ctx->cmdclient->cwd != NULL)
root = ctx->cmdclient->cwd;
else if (ctx->curclient != NULL)
else if (ctx->curclient != NULL && s->curw != NULL)
root = get_proc_cwd(s->curw->window->active->pid);
else
return (s->cwd);