diff options
| author | Thomas Adam <thomas@xteddy.org> | 2013-04-13 17:05:49 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2013-04-13 17:05:49 +0100 |
| commit | b58bca9a72009101da373a3b7463fd866ecac58c (patch) | |
| tree | e8f9b4b720b4c05f67fd47505b5170c4fd33dcb0 /cmd-copy-mode.c | |
| parent | e312db140868754358d40ec17595327a8fbbf180 (diff) | |
| parent | 27dcf470dc4aa5901ac7f01b3a9f971e02f2229e (diff) | |
| download | rtmux-b58bca9a72009101da373a3b7463fd866ecac58c.tar.gz rtmux-b58bca9a72009101da373a3b7463fd866ecac58c.tar.bz2 rtmux-b58bca9a72009101da373a3b7463fd866ecac58c.zip | |
Merge branch 'obsd-master'
Conflicts:
tmux.c
Diffstat (limited to 'cmd-copy-mode.c')
| -rw-r--r-- | cmd-copy-mode.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c index f014be83..40584a28 100644 --- a/cmd-copy-mode.c +++ b/cmd-copy-mode.c @@ -54,9 +54,11 @@ cmd_copy_mode_exec(struct cmd *self, struct cmd_q *cmdq) if (cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp) == NULL) return (CMD_RETURN_ERROR); - if (window_pane_set_mode(wp, &window_copy_mode) != 0) - return (CMD_RETURN_NORMAL); - window_copy_init_from_pane(wp); + if (wp->mode != &window_copy_mode) { + if (window_pane_set_mode(wp, &window_copy_mode) != 0) + return (CMD_RETURN_NORMAL); + window_copy_init_from_pane(wp); + } if (wp->mode == &window_copy_mode && args_has(self->args, 'u')) window_copy_pageup(wp); |