summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-02-20 13:38:39 +0100
committerwm4 <wm4@nowhere>2014-02-20 13:40:32 +0100
commit857952dce3e78e678bf6d14046e2290e7016d6b8 (patch)
treedb1be38bcd1bed525f6f4a62c8537405be11d993 /player
parent1d0730d22d83e2334db136b0b9f943f02daecef4 (diff)
downloadmpv-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 'player')
-rw-r--r--player/loadfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index f062bce27c..b5b42fe67c 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -1024,7 +1024,7 @@ static bool demux_was_interrupted(struct MPContext *mpctx)
mp_cmd_t *cmd = mp_input_get_cmd(mpctx->input, 0, 0);
if (!cmd)
break;
- if (mp_input_is_abort_cmd(cmd->id))
+ if (mp_input_is_abort_cmd(cmd))
run_command(mpctx, cmd);
mp_cmd_free(cmd);
}