aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2010-12-22 15:32:40 +0000
committerTiago Cunha <tcunha@gmx.com>2010-12-22 15:32:40 +0000
commitc05a47ad0d4522785199f4b724f10a8814058fb1 (patch)
tree465cbd7612f0887664a21a5f754d504672f63faf
parenta932742a8a60345ce134aea68c690fed6f3435fa (diff)
downloadrtmux-c05a47ad0d4522785199f4b724f10a8814058fb1.tar.gz
rtmux-c05a47ad0d4522785199f4b724f10a8814058fb1.tar.bz2
rtmux-c05a47ad0d4522785199f4b724f10a8814058fb1.zip
Sync OpenBSD patchset 804:
Undo a change to next/previous session that got mixed in prematurely.
-rw-r--r--session.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/session.c b/session.c
index 8fcb5c4d..40e9731f 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $Id: session.c,v 1.80 2010-12-22 15:31:56 tcunha Exp $ */
+/* $Id: session.c,v 1.81 2010-12-22 15:32:40 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -186,9 +186,10 @@ session_next_session(struct session *s)
struct session *s2;
u_int i;
- if (ARRAY_LENGTH(&sessions) == 0 || !session_alive(s))
+ if (ARRAY_LENGTH(&sessions) == 0 || session_index(s, &i) != 0)
return (NULL);
+ i = 0;
do {
if (i == ARRAY_LENGTH(&sessions) - 1)
i = 0;
@@ -207,7 +208,7 @@ session_previous_session(struct session *s)
struct session *s2;
u_int i;
- if (ARRAY_LENGTH(&sessions) == 0 || !session_alive(s))
+ if (ARRAY_LENGTH(&sessions) == 0 || session_index(s, &i) != 0)
return (NULL);
do {