From 6c42f1a89e16d69d5fe24bb8b3f6b37148cfa308 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Sat, 16 Oct 2010 07:57:42 +0000 Subject: [PATCH] Fall back on normal session choice method if $TMUX exists but is invalid rather than rejecting. --- cmd.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/cmd.c b/cmd.c index 2643bb12..b324621c 100644 --- a/cmd.c +++ b/cmd.c @@ -340,15 +340,11 @@ cmd_current_session(struct cmd_ctx *ctx) } /* Use the session from the TMUX environment variable. */ - if (data != NULL && data->pid != -1) { - if (data->pid != getpid()) - return (NULL); - if (data->idx > ARRAY_LENGTH(&sessions)) - return (NULL); - if ((s = ARRAY_ITEM(&sessions, data->idx)) == NULL) - return (NULL); + if (data != NULL && + data->pid == getpid() && + data->idx <= ARRAY_LENGTH(&sessions) && + (s = ARRAY_ITEM(&sessions, data->idx)) != NULL) return (s); - } return (cmd_choose_session(&sessions)); }