extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-08-13 15:37:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	Makefile
	grid-utf8.c
This commit is contained in:
Thomas Adam
2013-01-30 15:27:19 +00:00
parent 2ca8b7f359 fdbfc7e349
commit a3f4eb7b24
14 changed files with 198 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd.c
View File

@ -377,14 +377,14 @@ cmd_session_better(struct session *s, struct session *best,
int prefer_unattached)
{
if (best == NULL)
return 1;
return (1);
if (prefer_unattached) {
if (!(best->flags & SESSION_UNATTACHED) &&
(s->flags & SESSION_UNATTACHED))
return 1;
return (1);
else if ((best->flags & SESSION_UNATTACHED) &&
!(s->flags & SESSION_UNATTACHED))
return 0;
return (0);
}
return (timercmp(&s->activity_time, &best->activity_time, >));
}