summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-03-21 14:49:32 +0100
committerwm4 <wm4@nowhere>2018-03-26 19:47:08 +0200
commitf81ae9c3fc45886da45e6ae5fe90e5125a9e9bee (patch)
tree1e2d89f0a3b1884f674225a0c95551747623393d
parent7d10728aaadd171bc5e25545dae1c7dedd5145f7 (diff)
downloadmpv-f81ae9c3fc45886da45e6ae5fe90e5125a9e9bee.tar.bz2
mpv-f81ae9c3fc45886da45e6ae5fe90e5125a9e9bee.tar.xz
player: don't print error if aborted while loading external files
-rw-r--r--player/loadfile.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index 519e841ac7..5c741369c0 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -642,7 +642,8 @@ int mp_add_external_file(struct MPContext *mpctx, char *filename,
return first_num;
err_out:
- MP_ERR(mpctx, "Can not open external file %s.\n", disp_filename);
+ if (!mp_cancel_test(mpctx->playback_abort))
+ MP_ERR(mpctx, "Can not open external file %s.\n", disp_filename);
return -1;
}