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

the other functions.

diff --git a/usr.bin/tmux/cmd.c b/usr.bin/tmux/cmd.c
index 3d2d321..9cfb686 100644 (file)
--- a/usr.bin/tmux/cmd.c
+++ b/usr.bin/tmux/cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.c,v 1.94 2014/05/13 08:08:32 nicm Exp $ */
+/* $OpenBSD: cmd.c,v 1.95 2014/07/13 20:57:46 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -795,8 +795,11 @@ cmd_find_session(struct cmd_q *cmdq, const char *arg, int prefer_unattached)
        int                      ambiguous;
 
        /* A NULL argument means the current session. */
-       if (arg == NULL)
-               return (cmd_current_session(cmdq, prefer_unattached));
+       if (arg == NULL) {
+               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. */
        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. */
        if (*tmparg == '\0') {
                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. */