The branch, hooks has been updated
       via  ae6df48032814f6fc3377539c0f7da327575a48e (commit)
      from  0136562513d2e12b0d2c56d6cb67e705cb1b7fb7 (commit)

- Log -----------------------------------------------------------------
commit ae6df48032814f6fc3377539c0f7da327575a48e
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>

    Whoops removed too much.
---
 cmd-attach-session.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/cmd-attach-session.c b/cmd-attach-session.c
index 160f2a8..9335bdc 100644
--- a/cmd-attach-session.c
+++ b/cmd-attach-session.c
@@ -36,7 +36,7 @@ const struct cmd_entry cmd_attach_session_entry = {
        "attach-session", "attach",
        "c:drt:", 0, 0,
        "[-dr] [-c working-directory] " CMD_TARGET_SESSION_USAGE,
-       CMD_CANTNEST|CMD_STARTSERVER,
+       CMD_CANTNEST|CMD_STARTSERVER|CMD_PREPARESESSION,
        cmd_attach_session_exec
 };
 
@@ -76,6 +76,8 @@ cmd_attach_session(struct cmd_q *cmdq, const char *tflag, int 
dflag, int rflag,
                if (w != NULL)
                        wl = winlink_find_by_window(&s->windows, w);
        }
+       if ((s = cmdq->state.s) == NULL)
+               return (CMD_RETURN_ERROR);
 
        if (cmdq->client == NULL)
                return (CMD_RETURN_NORMAL);


-----------------------------------------------------------------------

Summary of changes:
 cmd-attach-session.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
tmux

------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs

Reply via email to