aboutsummaryrefslogtreecommitdiff
path: root/tmux.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2007-10-12 14:46:48 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2007-10-12 14:46:48 +0000
commit37f17a7e5b42156a325f2f3207610455cb004ad0 (patch)
tree5ba7b4a68cbc48e8d8a904fc0e4b35582615fca1 /tmux.c
parent514d6fa1ec60563318c67806334c3b8d97c95b02 (diff)
downloadrtmux-37f17a7e5b42156a325f2f3207610455cb004ad0.tar.gz
rtmux-37f17a7e5b42156a325f2f3207610455cb004ad0.tar.bz2
rtmux-37f17a7e5b42156a325f2f3207610455cb004ad0.zip
Warn and bork on nested sessions ($TMUX exists).
Diffstat (limited to 'tmux.c')
-rw-r--r--tmux.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/tmux.c b/tmux.c
index af28548c..17296af5 100644
--- a/tmux.c
+++ b/tmux.c
@@ -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);