summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-06-16 23:07:46 +0200
committerwm4 <wm4@nowhere>2015-06-16 23:07:46 +0200
commitdbdc46c97a32c53d41a19908aa365e7d81025c3e (patch)
tree033d4e697115e7d9176eef840951f07cd6e8fe69
parentb2781c11ed0ee68b42013df6000d5427a5c988f0 (diff)
downloadmpv-dbdc46c97a32c53d41a19908aa365e7d81025c3e.tar.bz2
mpv-dbdc46c97a32c53d41a19908aa365e7d81025c3e.tar.xz
player: do not exit when a seek gets queued
Seems logical. Note that if playback otherwise ends while playback is active and a seek is still queued, we still exit. Otherwise you couldn't end playback by seeking past the end of the file (which is classic MPlayer and mpv behavior).
-rw-r--r--player/playloop.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/player/playloop.c b/player/playloop.c
index 4f42b17e97..03be7df80a 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -303,6 +303,10 @@ void queue_seek(struct MPContext *mpctx, enum seek_type type, double amount,
enum seek_precision exact, bool immediate)
{
struct seek_params *seek = &mpctx->seek;
+
+ if (mpctx->stop_play == AT_END_OF_FILE)
+ mpctx->stop_play = KEEP_PLAYING;
+
switch (type) {
case MPSEEK_RELATIVE:
seek->immediate |= immediate;