summaryrefslogtreecommitdiff
path: root/usr.bin/tmux
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2015-04-28 11:57:21 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2015-04-28 11:57:21 +0000
commit9ee1ef9cc7d006433a575ea77e9bab470f8f5167 (patch)
tree3a9a83c4c6478d14f97dda2c51e27cd84adb528c /usr.bin/tmux
parent42678a7e374083f35f023a1749218bfe73fa4f9e (diff)
Do not do a search for the tty path if there isn't one.
Diffstat (limited to 'usr.bin/tmux')
-rw-r--r--usr.bin/tmux/cmd-find.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/usr.bin/tmux/cmd-find.c b/usr.bin/tmux/cmd-find.c
index 976b396f61d..5be7ec6c311 100644
--- a/usr.bin/tmux/cmd-find.c
+++ b/usr.bin/tmux/cmd-find.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-find.c,v 1.4 2015/04/28 11:33:17 nicm Exp $ */
+/* $OpenBSD: cmd-find.c,v 1.5 2015/04/28 11:57:20 nicm Exp $ */
/*
* Copyright (c) 2015 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -243,10 +243,13 @@ cmd_find_current_session_with_client(struct cmd_find_state *fs)
struct window_pane *wp;
/* If this is running in a pane, that's great. */
- RB_FOREACH(wp, window_pane_tree, &all_window_panes) {
- if (strcmp(wp->tty, fs->cmdq->client->tty.path) == 0)
- break;
- }
+ if (fs->cmdq->client->tty.path != NULL) {
+ RB_FOREACH(wp, window_pane_tree, &all_window_panes) {
+ if (strcmp(wp->tty, fs->cmdq->client->tty.path) == 0)
+ break;
+ }
+ } else
+ wp = NULL;
/* Not running in a pane. We know nothing. Find the best session. */
if (wp == NULL) {