summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2020-06-10 11:43:19 +0200
committerwm4 <wm4@nowhere>2020-06-10 11:44:47 +0200
commit44ad00ba1001c18539494c3333c508436aa898e8 (patch)
tree2b1dcf079c8c622e3c5753b7b9c929f1d0696bf9
parentd5de79d10f895aaa8f65340adf949d28bc09b2d7 (diff)
downloadmpv-44ad00ba1001c18539494c3333c508436aa898e8.tar.bz2
mpv-44ad00ba1001c18539494c3333c508436aa898e8.tar.xz
player: make unpausing directly after seek work with --keep-open (again)
Commit fcf0b80dc9dd3 fixed this the first time. Commit 85576f31a9cc2 "accidentally" removed this code again. The commit message justifying the removal is correct, except it doesn't take other side-effects of the state machine into account. I obviously didn't remember what exactly this was about. So add a comment explaining it this time. Just apply it again; the thing the latter commit fixed still works. Fixes: #7819
-rw-r--r--player/playloop.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/player/playloop.c b/player/playloop.c
index 7b8b65e0f0..01ad5e63c6 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -1158,6 +1158,9 @@ static void handle_playback_restart(struct MPContext *mpctx)
static void handle_eof(struct MPContext *mpctx)
{
+ if (mpctx->seek.type)
+ return; // for proper keep-open operation
+
/* Don't quit while paused and we're displaying the last video frame. On the
* other hand, if we don't have a video frame, then the user probably seeked
* outside of the video, and we do want to quit. */