From f98c66ece81953c777cd332c6bd29d707b1685e5 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 7 Mar 2019 20:24:21 +0000
Subject: Add a separate mode struct for the active window mode if any.

---
 cmd-copy-mode.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'cmd-copy-mode.c')

diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c
index 699a868d..1668029c 100644
--- a/cmd-copy-mode.c
+++ b/cmd-copy-mode.c
@@ -74,18 +74,18 @@ cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item)
 		return (CMD_RETURN_NORMAL);
 	}
 
-	if (wp->mode != &window_copy_mode) {
+	if (wp->mode == NULL || wp->mode->mode != &window_copy_mode) {
 		flag = window_pane_set_mode(wp, &window_copy_mode, NULL, NULL);
 		if (flag != 0)
 			return (CMD_RETURN_NORMAL);
 		window_copy_init_from_pane(wp, args_has(self->args, 'e'));
 	}
 	if (args_has(args, 'M')) {
-		if (wp->mode != NULL && wp->mode != &window_copy_mode)
+		if (wp->mode != NULL && wp->mode->mode != &window_copy_mode)
 			return (CMD_RETURN_NORMAL);
 		window_copy_start_drag(c, &shared->mouse);
 	}
-	if (wp->mode == &window_copy_mode && args_has(self->args, 'u'))
+	if (args_has(self->args, 'u'))
 		window_copy_pageup(wp, 0);
 
 	return (CMD_RETURN_NORMAL);
-- 
cgit