aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmd.c12
1 files 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));
}