mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 01:34:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fall back on normal session choice method if $TMUX exists but is invalid

Browse Source 
rather than rejecting.
This commit is contained in:
Nicholas Marriott
2010-10-16 07:57:42 +00:00
parent 65ff5b00bd
commit 6c42f1a89e
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd.c
View File

@@ -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));
}