aboutsummaryrefslogtreecommitdiff
path: root/cmd-select-pane.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-05-26 14:02:15 +0100
committerThomas Adam <thomas@xteddy.org>2020-05-26 14:02:15 +0100
commita4cb700269e033b5ad429275d7c61d3c3c2f1af3 (patch)
treef469586f1cffa3569385d88efa4305c2c83c18ef /cmd-select-pane.c
parentbc2e0cf7ff51c2ab13c7dcc792d25e11ba7a3ef4 (diff)
parent392b381d1cec6d63c4baaa709243f760ff6c3403 (diff)
downloadrtmux-a4cb700269e033b5ad429275d7c61d3c3c2f1af3.tar.gz
rtmux-a4cb700269e033b5ad429275d7c61d3c3c2f1af3.tar.bz2
rtmux-a4cb700269e033b5ad429275d7c61d3c3c2f1af3.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-select-pane.c')
-rw-r--r--cmd-select-pane.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd-select-pane.c b/cmd-select-pane.c
index 3b639e06..313deefe 100644
--- a/cmd-select-pane.c
+++ b/cmd-select-pane.c
@@ -129,7 +129,10 @@ cmd_select_pane_exec(struct cmd *self, struct cmdq_item *item)
if (args_has(args, 'm') || args_has(args, 'M')) {
if (args_has(args, 'm') && !window_pane_visible(wp))
return (CMD_RETURN_NORMAL);
- lastwp = marked_pane.wp;
+ if (server_check_marked())
+ lastwp = marked_pane.wp;
+ else
+ lastwp = NULL;
if (args_has(args, 'M') || server_is_marked(s, wl, wp))
server_clear_marked();