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-new-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-new-session.c')
| -rw-r--r-- | cmd-new-session.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd-new-session.c b/cmd-new-session.c index 81c2f467..2d671275 100644 --- a/cmd-new-session.c +++ b/cmd-new-session.c @@ -325,10 +325,10 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item) if (!detached) { c->flags |= CLIENT_ATTACHED; - cmd_find_from_session(&item->shared->current, s); + cmd_find_from_session(&item->shared->current, s, 0); } - cmd_find_from_session(&fs, s); + cmd_find_from_session(&fs, s, 0); hooks_insert(s->hooks, item, &fs, "after-new-session"); free(to_free); |