summaryrefslogtreecommitdiffstats
path: root/player/playloop.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-09-24 01:56:53 +0200
committerwm4 <wm4@nowhere>2014-09-24 01:56:53 +0200
commit735a9c39d7bb7842e92eb04de3ad2eb1a93588ee (patch)
treeb953ab0b226811ac6ee1c2478b8fb6c832f028d7 /player/playloop.c
parent53c288d364c86aae6ec7b0eab40ef31a59d03644 (diff)
downloadmpv-735a9c39d7bb7842e92eb04de3ad2eb1a93588ee.tar.bz2
mpv-735a9c39d7bb7842e92eb04de3ad2eb1a93588ee.tar.xz
player: change --keep-open semantics
By popular request.
Diffstat (limited to 'player/playloop.c')
-rw-r--r--player/playloop.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/player/playloop.c b/player/playloop.c
index fc3259de01..d5c3ac0713 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -764,7 +764,9 @@ static void handle_loop_file(struct MPContext *mpctx)
static void handle_keep_open(struct MPContext *mpctx)
{
struct MPOpts *opts = mpctx->opts;
- if (opts->keep_open && mpctx->stop_play == AT_END_OF_FILE) {
+ if (opts->keep_open && mpctx->stop_play == AT_END_OF_FILE &&
+ !playlist_get_next(mpctx->playlist, 1) && opts->loop_times < 0)
+ {
mpctx->stop_play = KEEP_PLAYING;
if (mpctx->d_video)
mpctx->playback_pts = mpctx->last_vo_pts;