diff options
| author | wm4 <wm4@nowhere> | 2014-02-20 13:38:39 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-02-20 13:40:32 +0100 |
| commit | 857952dce3e78e678bf6d14046e2290e7016d6b8 (patch) | |
| tree | db1be38bcd1bed525f6f4a62c8537405be11d993 /input/input.c | |
| parent | 1d0730d22d83e2334db136b0b9f943f02daecef4 (diff) | |
| download | mpv-857952dce3e78e678bf6d14046e2290e7016d6b8.tar.bz2 mpv-857952dce3e78e678bf6d14046e2290e7016d6b8.tar.xz | |
input: check for abort cmd in multi-commands
MP_CMD_COMMAND_LIST commands (used to implement key bindings with
multiple commands) were not checked for abort commands. Implement it.
Remove the remarks about multi-commands being special from the manpage.
Seek coalescing is handled differently now, and the issue with abort
commands is fixed with this commit.
Diffstat (limited to 'input/input.c')
| -rw-r--r-- | input/input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/input/input.c b/input/input.c index 96699b5ba0..9061f2008a 100644 --- a/input/input.c +++ b/input/input.c @@ -238,7 +238,7 @@ static bool queue_has_abort_cmds(struct cmd_queue *queue) { bool ret = false; for (struct mp_cmd *cmd = queue->first; cmd; cmd = cmd->queue_next) - if (mp_input_is_abort_cmd(cmd->id)) { + if (mp_input_is_abort_cmd(cmd)) { ret = true; break; } @@ -584,7 +584,7 @@ static bool should_drop_cmd(struct input_ctx *ictx, struct mp_cmd *cmd) { struct cmd_queue *queue = &ictx->cmd_queue; return (queue_count_cmds(queue) >= ictx->key_fifo_size && - (!mp_input_is_abort_cmd(cmd->id) || queue_has_abort_cmds(queue))); + (!mp_input_is_abort_cmd(cmd) || queue_has_abort_cmds(queue))); } static void interpret_key(struct input_ctx *ictx, int code, double scale) |