summaryrefslogtreecommitdiffstats
path: root/player/loadfile.c
diff options
context:
space:
mode:
Diffstat (limited to 'player/loadfile.c')
-rw-r--r--player/loadfile.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index edba9caa1b..4a886ff156 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -227,6 +227,8 @@ void reselect_demux_stream(struct MPContext *mpctx, struct track *track)
if (pts != MP_NOPTS_VALUE)
pts += get_track_seek_offset(mpctx, track);
demuxer_select_track(track->demuxer, track->stream, pts, track->selected);
+ if (track == mpctx->seek_slave)
+ mpctx->seek_slave = NULL;
}
// Called from the demuxer thread if a new packet is available.
@@ -548,6 +550,9 @@ bool mp_remove_track(struct MPContext *mpctx, struct track *track)
sub_destroy(track->d_sub);
+ if (mpctx->seek_slave == track)
+ mpctx->seek_slave = NULL;
+
int index = 0;
while (index < mpctx->num_tracks && mpctx->tracks[index] != track)
index++;