diff options
| author | wm4 <wm4@nowhere> | 2015-07-08 21:31:31 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-07-08 21:31:31 +0200 |
| commit | 15581f2209898bdd1747d4a32f57a00ba5098fdd (patch) | |
| tree | 6462bf49695bb931d726a0937ad4c974d2006e05 /player/video.c | |
| parent | 0be07e1d86c4817a3889196de1ae59ae7130fc35 (diff) | |
| download | mpv-15581f2209898bdd1747d4a32f57a00ba5098fdd.tar.bz2 mpv-15581f2209898bdd1747d4a32f57a00ba5098fdd.tar.xz | |
player: never overwrite stop_play field
This is a real pain: if a quit command is received, it's set to PT_QUIT.
And then other code could overwrite it, making it not quit. The annoying
bit is that stop_play is written and read in many places. Just not
overwriting it unconditionally seems to be the best course of action.
Diffstat (limited to 'player/video.c')
| -rw-r--r-- | player/video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/player/video.c b/player/video.c index 87e6a8fb60..ccdac3b042 100644 --- a/player/video.c +++ b/player/video.c @@ -926,7 +926,7 @@ void write_video(struct MPContext *mpctx, double endpts) if (!mpctx->step_frames && !opts->pause) pause_player(mpctx); } - if (mpctx->max_frames == 0) + if (mpctx->max_frames == 0 && !mpctx->stop_play) mpctx->stop_play = AT_END_OF_FILE; if (mpctx->max_frames > 0) mpctx->max_frames--; |