From ae70071494a297a8a37518baadaabaf0bd44775b Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Wed, 11 Aug 2010 07:41:05 +0000
Subject: [PATCH] Handle failure to change mode, to avoid dying when switching
 into copy mode when already in a different mode. Reported by "Florian".

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

diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c
index 714ec35f..3e858a33 100644
--- a/cmd-copy-mode.c
+++ b/cmd-copy-mode.c
@@ -62,7 +62,8 @@ cmd_copy_mode_exec(struct cmd *self, struct cmd_ctx *ctx)
 	if (cmd_find_pane(ctx, data->target, NULL, &wp) == NULL)
 		return (-1);
 
-	window_pane_set_mode(wp, &window_copy_mode);
+	if (window_pane_set_mode(wp, &window_copy_mode) != 0)
+		return (0);
 	window_copy_init_from_pane(wp);
 	if (wp->mode == &window_copy_mode && cmd_check_flag(data->chflags, 'u'))
 		window_copy_pageup(wp);