summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/session.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2010-12-20 00:43:24 +0000
committernicm <nicm@openbsd.org>2010-12-20 00:43:24 +0000
commitb43afa2d7308db5cb4a2d85030b5bb1dbfe0268e (patch)
treed1b85782b8f0dbc0865109028eea987b44df94e5 /usr.bin/tmux/session.c
parentDead sessions are never on the active sessions list, so the SESSION_DEAD (diff)
downloadwireguard-openbsd-b43afa2d7308db5cb4a2d85030b5bb1dbfe0268e.tar.xz
wireguard-openbsd-b43afa2d7308db5cb4a2d85030b5bb1dbfe0268e.zip
Undo a change to next/previous session that got mixed in prematurely.
Diffstat (limited to 'usr.bin/tmux/session.c')
-rw-r--r--usr.bin/tmux/session.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/tmux/session.c b/usr.bin/tmux/session.c
index fedeb545ec9..fa0e6fa60d1 100644
--- a/usr.bin/tmux/session.c
+++ b/usr.bin/tmux/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.22 2010/12/20 00:19:20 nicm Exp $ */
+/* $OpenBSD: session.c,v 1.23 2010/12/20 00:43:24 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -187,9 +187,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;
@@ -208,7 +209,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 {