summaryrefslogtreecommitdiffstats
path: root/player/sub.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-06-30 17:15:29 +0200
committerwm4 <wm4@nowhere>2018-06-30 17:15:29 +0200
commit99afa8d51baa494a8e04ffedc6f39f372489883e (patch)
treee3766e4bbee15da5325947cbcdacb353e8642dda /player/sub.c
parent4d6d3a3455e15747f318e80487831f2692ffc46c (diff)
downloadmpv-99afa8d51baa494a8e04ffedc6f39f372489883e.tar.bz2
mpv-99afa8d51baa494a8e04ffedc6f39f372489883e.tar.xz
player: don't cache subtitles across deselection
This means reselection triggers full reinit. This is better if you have options that "edit" subtitles or whatever.
Diffstat (limited to 'player/sub.c')
-rw-r--r--player/sub.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/player/sub.c b/player/sub.c
index 65b8ecc78f..0656dd5b56 100644
--- a/player/sub.c
+++ b/player/sub.c
@@ -70,6 +70,8 @@ void uninit_sub(struct MPContext *mpctx, struct track *track)
sub_select(track->d_sub, false);
int order = get_order(mpctx, track);
osd_set_sub(mpctx->osd, order, NULL);
+ sub_destroy(track->d_sub);
+ track->d_sub = NULL;
}
}
@@ -182,7 +184,9 @@ void reinit_sub(struct MPContext *mpctx, struct track *track)
if (!track || !track->stream || track->stream->type != STREAM_SUB)
return;
- if (!track->d_sub && !init_subdec(mpctx, track)) {
+ assert(!track->d_sub);
+
+ if (!init_subdec(mpctx, track)) {
error_on_track(mpctx, track);
return;
}