From a384245c5aa1b1be2a73d9b3318a4c0d5bfc5391 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 8 May 2019 18:05:03 +0000
Subject: Adjust how mouse targets are found so they always have a session,
 window and pane.

---
 cmd-find.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'cmd-find.c')

diff --git a/cmd-find.c b/cmd-find.c
index 2fa53b9c..e5ef8b99 100644
--- a/cmd-find.c
+++ b/cmd-find.c
@@ -1040,12 +1040,16 @@ cmd_find_target(struct cmd_find_state *fs, struct cmdq_item *item,
 		switch (type) {
 		case CMD_FIND_PANE:
 			fs->wp = cmd_mouse_pane(m, &fs->s, &fs->wl);
-			if (fs->wp != NULL)
+			if (fs->wp != NULL) {
 				fs->w = fs->wl->window;
-			break;
+				break;
+			}
+			/* FALLTHROUGH */
 		case CMD_FIND_WINDOW:
 		case CMD_FIND_SESSION:
 			fs->wl = cmd_mouse_window(m, &fs->s);
+			if (fs->wl == NULL && fs->s != NULL)
+				fs->wl = fs->s->curw;
 			if (fs->wl != NULL) {
 				fs->w = fs->wl->window;
 				fs->wp = fs->w->active;
-- 
cgit