From b79f291f4bb6f3f2efb24b9f03829784c17a0541 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 20 Oct 2014 23:43:10 +0200 Subject: 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. --- player/loadfile.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'player/loadfile.c') 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; } } -- cgit v1.2.3