Warn and bork on nested sessions ($TMUX exists).

This commit is contained in:
Nicholas Marriott
2007-10-12 14:46:48 +00:00
parent 514d6fa1ec
commit 37f17a7e5b
7 changed files with 18 additions and 10 deletions

5
tmux.c
View File

@ -1,4 +1,4 @@
/* $Id: tmux.c,v 1.30 2007-10-12 12:08:51 nicm Exp $ */
/* $Id: tmux.c,v 1.31 2007-10-12 14:46:48 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -210,7 +210,8 @@ main(int argc, char **argv)
exit(1);
}
if (!(cmd->entry->flags & CMD_NOSESSION))
if (!(cmd->entry->flags & CMD_NOSESSION) ||
(cmd->entry->flags & CMD_CANTNEST))
client_fill_sessid(&data.sid, name);
if (client_init(path, &cctx, cmd->entry->flags & CMD_STARTSERVER) != 0)
exit(1);