diff options
author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-08-30 12:04:09 +0100 |
---|---|---|
committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-08-30 12:04:09 +0100 |
commit | 07c679b52d18f198a60da2bd5b9b743bac55680f (patch) | |
tree | 6e6db084991d889e61e0a5d53db1f8740a666ce6 /cmd-attach-session.c | |
parent | 2e4e521629a8e23502551cfe13ea327e1971d1e2 (diff) | |
parent | b4c633cc40cd3d5963e24e6d560bc2c7f6553000 (diff) | |
download | rtmux-07c679b52d18f198a60da2bd5b9b743bac55680f.tar.gz rtmux-07c679b52d18f198a60da2bd5b9b743bac55680f.tar.bz2 rtmux-07c679b52d18f198a60da2bd5b9b743bac55680f.zip |
Merge branch 'master' into 2.6-rc
Diffstat (limited to 'cmd-attach-session.c')
-rw-r--r-- | cmd-attach-session.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd-attach-session.c b/cmd-attach-session.c index 81ed4a87..38d9f8a2 100644 --- a/cmd-attach-session.c +++ b/cmd-attach-session.c @@ -90,9 +90,9 @@ cmd_attach_session(struct cmdq_item *item, const char *tflag, int dflag, window_set_active_pane(wp->window, wp); session_set_current(s, wl); if (wp != NULL) - cmd_find_from_winlink_pane(current, wl, wp); + cmd_find_from_winlink_pane(current, wl, wp, 0); else - cmd_find_from_winlink(current, wl); + cmd_find_from_winlink(current, wl, 0); } if (cflag != NULL) { |