diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-04-22 10:05:54 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-04-22 10:05:54 +0100 |
| commit | 0a88377086329786c438d4973365fdb21186f4e4 (patch) | |
| tree | df5b091b400df84974f58bbfbb78ee26ccb9a5f6 /cmd-copy-mode.c | |
| parent | b25dc423b0b1369aaec5dee8e051d541bd55043f (diff) | |
| parent | 3909aff06aa6de748ae057cab1e723eec2387edd (diff) | |
| download | rtmux-0a88377086329786c438d4973365fdb21186f4e4.tar.gz rtmux-0a88377086329786c438d4973365fdb21186f4e4.tar.bz2 rtmux-0a88377086329786c438d4973365fdb21186f4e4.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-copy-mode.c')
| -rw-r--r-- | cmd-copy-mode.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c index 19dca5ff..d729ada6 100644 --- a/cmd-copy-mode.c +++ b/cmd-copy-mode.c @@ -68,8 +68,11 @@ cmd_copy_mode_exec(struct cmd *self, struct cmd_q *cmdq) return (CMD_RETURN_NORMAL); window_copy_init_from_pane(wp); } - if (args_has(args, 'M')) + if (args_has(args, 'M')) { + if (wp->mode != NULL && wp->mode != &window_copy_mode) + return (CMD_RETURN_NORMAL); window_copy_start_drag(c, &cmdq->item->mouse); + } if (wp->mode == &window_copy_mode && args_has(self->args, 'u')) window_copy_pageup(wp); |