From 37f17a7e5b42156a325f2f3207610455cb004ad0 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Fri, 12 Oct 2007 14:46:48 +0000
Subject: Warn and bork on nested sessions ($TMUX exists).

---
 server-msg.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'server-msg.c')

diff --git a/server-msg.c b/server-msg.c
index 41f4aa63..6fa574c8 100644
--- a/server-msg.c
+++ b/server-msg.c
@@ -1,4 +1,4 @@
-/* $Id: server-msg.c,v 1.25 2007-10-04 22:04:01 nicm Exp $ */
+/* $Id: server-msg.c,v 1.26 2007-10-12 14:46:48 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -123,6 +123,12 @@ server_msg_fn_command(struct hdr *hdr, struct client *c)
 	ctx.client = c;
 	ctx.flags = 0;
 
+	if (data.sid.pid != -1 && (cmd->entry->flags & CMD_CANTNEST)) {
+		server_msg_fn_command_error(&ctx, "sessions should be nested "
+		    "with care. unset $TMUX and retry to force");
+		return (0);
+	}
+
 	if (cmd->entry->flags & CMD_NOSESSION)
 		ctx.session = NULL;
 	else {
-- 
cgit