summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--player/loadfile.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index 94a0274297..f062bce27c 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -1322,15 +1322,13 @@ goto_reopen_demuxer: ;
// If there's a timeline force an absolute seek to initialize state
double startpos = rel_time_to_abs(mpctx, opts->play_start, -1);
- if (startpos != -1 || mpctx->timeline) {
- queue_seek(mpctx, MPSEEK_ABSOLUTE, startpos, 0, true);
- execute_queued_seek(mpctx);
- }
if (startpos == -1 && mpctx->resolve_result &&
mpctx->resolve_result->start_time > 0)
- {
- queue_seek(mpctx, MPSEEK_ABSOLUTE, mpctx->resolve_result->start_time,
- 0, true);
+ startpos = mpctx->resolve_result->start_time;
+ if (startpos == -1 && mpctx->timeline)
+ startpos = 0;
+ if (startpos != -1) {
+ queue_seek(mpctx, MPSEEK_ABSOLUTE, startpos, 0, true);
execute_queued_seek(mpctx);
}
if (opts->chapterrange[0] > 0) {