Do not do a search for the tty path if there isn't one.
authornicm <nicm@openbsd.org>
Tue, 28 Apr 2015 11:57:20 +0000 (11:57 +0000)
committernicm <nicm@openbsd.org>
Tue, 28 Apr 2015 11:57:20 +0000 (11:57 +0000)
usr.bin/tmux/cmd-find.c

index 976b396..5be7ec6 100644 (file)
@@ -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) {