summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2010-10-05 17:15:21 +0000
committernicm <nicm@openbsd.org>2010-10-05 17:15:21 +0000
commitf13c50ff6eecbac00e00206c2509dbb0a452a5fe (patch)
tree38faf736f966876e2053e040707e215c1728ef0e
parentsplit acpi_enable_onegpe to separate enable/disable functions (diff)
downloadwireguard-openbsd-f13c50ff6eecbac00e00206c2509dbb0a452a5fe.tar.xz
wireguard-openbsd-f13c50ff6eecbac00e00206c2509dbb0a452a5fe.zip
Skip NULL entries in the sessions list when choosing the next session,
from Simon Olofsson.
-rw-r--r--usr.bin/tmux/server-fn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/tmux/server-fn.c b/usr.bin/tmux/server-fn.c
index a69ff8d9d67..c7253dc09d3 100644
--- a/usr.bin/tmux/server-fn.c
+++ b/usr.bin/tmux/server-fn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-fn.c,v 1.42 2010/09/26 20:43:30 nicm Exp $ */
+/* $OpenBSD: server-fn.c,v 1.43 2010/10/05 17:15:21 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -368,7 +368,7 @@ server_next_session(struct session *s)
s_out = NULL;
for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
s_loop = ARRAY_ITEM(&sessions, i);
- if (s_loop == s)
+ if (s_loop == NULL || s_loop == s)
continue;
if (s_out == NULL ||
timercmp(&s_loop->activity_time, &s_out->activity_time, <))