Show an error if cmd_find_session can't find the current session, like

the other functions.
This commit is contained in:
nicm 2014-07-13 20:57:46 +00:00
parent 2b67907176
commit c5253ad8f7

11
cmd.c
View File

@ -795,8 +795,11 @@ cmd_find_session(struct cmd_q *cmdq, const char *arg, int prefer_unattached)
int ambiguous; int ambiguous;
/* A NULL argument means the current session. */ /* A NULL argument means the current session. */
if (arg == NULL) if (arg == NULL) {
return (cmd_current_session(cmdq, prefer_unattached)); if ((s = cmd_current_session(cmdq, prefer_unattached)) == NULL)
cmdq_error(cmdq, "can't establish current session");
return (s);
}
/* Lookup as pane id or window id. */ /* Lookup as pane id or window id. */
if ((wp = cmd_lookup_paneid(arg)) != NULL) if ((wp = cmd_lookup_paneid(arg)) != NULL)
@ -813,7 +816,9 @@ cmd_find_session(struct cmd_q *cmdq, const char *arg, int prefer_unattached)
/* An empty session name is the current session. */ /* An empty session name is the current session. */
if (*tmparg == '\0') { if (*tmparg == '\0') {
free(tmparg); free(tmparg);
return (cmd_current_session(cmdq, prefer_unattached)); if ((s = cmd_current_session(cmdq, prefer_unattached)) == NULL)
cmdq_error(cmdq, "can't establish current session");
return (s);
} }
/* Find the session, if any. */ /* Find the session, if any. */