diff options
author | Thomas Adam <thomas@xteddy.org> | 2020-04-14 00:01:41 +0100 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2020-04-14 00:01:41 +0100 |
commit | 653a159225609f7e5efb45bc78cdf7b480d7ef93 (patch) | |
tree | de075bcb7fdbd8a3fbd9f800c3a04c63cfdfac6b /cmd-lock-server.c | |
parent | 2159ff3256df4b823dfaed24e64047249cf079c2 (diff) | |
parent | fc83517913c8280c222a6cf78ca7fb8053421b37 (diff) | |
download | rtmux-653a159225609f7e5efb45bc78cdf7b480d7ef93.tar.gz rtmux-653a159225609f7e5efb45bc78cdf7b480d7ef93.tar.bz2 rtmux-653a159225609f7e5efb45bc78cdf7b480d7ef93.zip |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-lock-server.c')
-rw-r--r-- | cmd-lock-server.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cmd-lock-server.c b/cmd-lock-server.c index 086cf639..a0df95b0 100644 --- a/cmd-lock-server.c +++ b/cmd-lock-server.c @@ -57,26 +57,22 @@ const struct cmd_entry cmd_lock_client_entry = { .args = { "t:", 0, 0 }, .usage = CMD_TARGET_CLIENT_USAGE, - .flags = CMD_AFTERHOOK, + .flags = CMD_AFTERHOOK|CMD_CLIENT_TFLAG, .exec = cmd_lock_server_exec }; static enum cmd_retval cmd_lock_server_exec(struct cmd *self, struct cmdq_item *item) { - struct args *args = cmd_get_args(self); struct cmd_find_state *target = cmdq_get_target(item); - struct client *c; + struct client *tc = cmdq_get_target_client(item); if (cmd_get_entry(self) == &cmd_lock_server_entry) server_lock(); else if (cmd_get_entry(self) == &cmd_lock_session_entry) server_lock_session(target->s); - else { - if ((c = cmd_find_client(item, args_get(args, 't'), 0)) == NULL) - return (CMD_RETURN_ERROR); - server_lock_client(c); - } + else + server_lock_client(tc); recalculate_sizes(); return (CMD_RETURN_NORMAL); |