From 9858071dd087b19da6f7674e99120e5f39b8702e Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Wed, 11 Aug 2010 22:18:28 +0000 Subject: [PATCH] Sync OpenBSD patchset 748: 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c index d1647ee1..c2b463cc 100644 --- a/cmd-copy-mode.c +++ b/cmd-copy-mode.c @@ -1,4 +1,4 @@ -/* $Id: cmd-copy-mode.c,v 1.27 2010-04-05 05:11:42 micahcowan Exp $ */ +/* $Id: cmd-copy-mode.c,v 1.28 2010-08-11 22:18:28 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -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);