aboutsummaryrefslogtreecommitdiff
path: root/cmd.c
diff options
context:
space:
mode:
authorThomas Adam <thomas.adam@smoothwall.net>2013-01-30 15:27:19 +0000
committerThomas Adam <thomas.adam@smoothwall.net>2013-01-30 15:27:19 +0000
commita3f4eb7b24ee98b4a499ca52c29ec2e29f33aa76 (patch)
treefc72465468b26b578f9546eede2a3f7334442928 /cmd.c
parent2ca8b7f3593ec5a88c9f56a43f5076800957a0db (diff)
parentfdbfc7e3498e1cdd04e8df58aa1a937ee4d79caa (diff)
downloadrtmux-a3f4eb7b24ee98b4a499ca52c29ec2e29f33aa76.tar.gz
rtmux-a3f4eb7b24ee98b4a499ca52c29ec2e29f33aa76.tar.bz2
rtmux-a3f4eb7b24ee98b4a499ca52c29ec2e29f33aa76.zip
Merge branch 'obsd-master'
Conflicts: Makefile grid-utf8.c
Diffstat (limited to 'cmd.c')
-rw-r--r--cmd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd.c b/cmd.c
index 775e1213..6869c12c 100644
--- a/cmd.c
+++ b/cmd.c
@@ -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, >));
}