summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2020-03-21 13:03:38 +0100
committerwm4 <wm4@nowhere>2020-03-21 13:03:38 +0100
commita5af126f918b86958a34a6eddc86f744978323ef (patch)
tree384c475d6ef582fbbfa48e707f461196dbf9a1cf
parent33519d61aa67fca41cdae79935f6e2d2ab3c32be (diff)
downloadmpv-a5af126f918b86958a34a6eddc86f744978323ef.tar.bz2
mpv-a5af126f918b86958a34a6eddc86f744978323ef.tar.xz
player: actually report an exit error if encoding mode fails on closing
The code that determines the process exit code ignores all stop_play values other than PT_QUIT. Generally, PT_ERROR is meaningless outside of play_current_file(), and is mostly equivalent to PT_NEXT_ENTRY. Do something that makes it report a non-0 exit code, and indicates in the terminal exit message that something went wrong. Untested.
-rw-r--r--player/loadfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index 19f8971f38..baedfbbcb7 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -1809,7 +1809,7 @@ void mp_play_files(struct MPContext *mpctx)
uninit_video_out(mpctx);
if (!encode_lavc_free(mpctx->encode_lavc_ctx))
- mpctx->stop_play = PT_ERROR;
+ mpctx->files_errored += 1;
mpctx->encode_lavc_ctx = NULL;
}