diff options
| -rw-r--r-- | cmd-copy-mode.c | 8 | ||||
| -rw-r--r-- | cmd-scroll-mode.c | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c index af83e10c..681f8ba7 100644 --- a/cmd-copy-mode.c +++ b/cmd-copy-mode.c @@ -44,13 +44,15 @@ cmd_copy_mode_exec(struct cmd *self, struct cmd_ctx *ctx) { struct cmd_target_data *data = self->data; struct winlink *wl; + struct window_pane *wp; if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL) return (-1); + wp = wl->window->active; - window_pane_set_mode(wl->window->active, &window_copy_mode); - if (data->flags & CMD_UFLAG) - window_copy_pageup(wl->window->active); + window_pane_set_mode(wp, &window_copy_mode); + if (wp->mode == &window_copy_mode && data->flags & CMD_UFLAG) + window_copy_pageup(wp); return (0); } diff --git a/cmd-scroll-mode.c b/cmd-scroll-mode.c index c34f9bd6..0d1f2291 100644 --- a/cmd-scroll-mode.c +++ b/cmd-scroll-mode.c @@ -60,13 +60,15 @@ cmd_scroll_mode_exec(struct cmd *self, struct cmd_ctx *ctx) { struct cmd_target_data *data = self->data; struct winlink *wl; + struct window_pane *wp; if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL) return (-1); + wp = wl->window->active; - window_pane_set_mode(wl->window->active, &window_scroll_mode); - if (data->flags & CMD_UFLAG) - window_scroll_pageup(wl->window->active); + window_pane_set_mode(wp, &window_scroll_mode); + if (wp->mode == &window_scroll_mode && data->flags & CMD_UFLAG) + window_scroll_pageup(wp); return (0); } |