circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-24 01:58:46 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 774:

Browse Source 
Fall back on normal session choice method if $TMUX exists but is invalid
rather than rejecting.
This commit is contained in:
Tiago Cunha 2010-10-24 00:32:35 +00:00
parent e7a4b68f73
commit 5a0ecc5931
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd.c,v 1.142 2010-07-17 14:38:13 tcunha Exp $ */
/* $Id: cmd.c,v 1.143 2010-10-24 00:32:35 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -339,15 +339,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));
}