diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-03-07 22:02:42 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-03-07 22:02:42 +0000 |
| commit | 349aeb806ab02797e1d28be22802e73f75b77c1d (patch) | |
| tree | 4c0441cbe888d2d8902c19d66da6acef6bf95e39 /cmd-copy-mode.c | |
| parent | a1009e7bd3c4acd7dc4157e317013f066d1deca8 (diff) | |
| parent | f98c66ece81953c777cd332c6bd29d707b1685e5 (diff) | |
| download | rtmux-349aeb806ab02797e1d28be22802e73f75b77c1d.tar.gz rtmux-349aeb806ab02797e1d28be22802e73f75b77c1d.tar.bz2 rtmux-349aeb806ab02797e1d28be22802e73f75b77c1d.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-copy-mode.c')
| -rw-r--r-- | cmd-copy-mode.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |