diff options
| author | wm4 <wm4@nowhere> | 2014-10-20 23:43:10 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-10-20 23:43:10 +0200 |
| commit | b79f291f4bb6f3f2efb24b9f03829784c17a0541 (patch) | |
| tree | f1b6ef3717a3d0d6e834b67830cd894d623d9eeb /player/loadfile.c | |
| parent | a67be5dd05302e29f03f34e8758a779cb21c487c (diff) | |
| download | mpv-b79f291f4bb6f3f2efb24b9f03829784c17a0541.tar.bz2 mpv-b79f291f4bb6f3f2efb24b9f03829784c17a0541.tar.xz | |
command: remove hook cancellation mechanism
I doubt anyone will actually use this correctly. Also, there was a bug
(a typo) which prevented it from working at all.
Diffstat (limited to 'player/loadfile.c')
| -rw-r--r-- | player/loadfile.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/player/loadfile.c b/player/loadfile.c index f448389754..470e0d24eb 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -802,11 +802,10 @@ static int process_open_hooks(struct MPContext *mpctx) while (!mp_hook_test_completion(mpctx, "on_load")) { mp_idle(mpctx); if (mpctx->stop_play) { - if (mpctx->stop_play == PT_QUIT) - return -1; // Can't exit immediately, the script would interfere with the // next file being loaded. - mp_hook_abort(mpctx, "on_load"); + if (mpctx->stop_play == PT_QUIT) + return -1; } } |