From 164bf3eaae49f654d609c747850b3f564fa20102 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 11 Apr 2013 14:24:52 +0100
Subject: Try to fix lack of subs in the viewer after they are turned on.

---
 src/lib/player.cc     | 2 +-
 src/lib/transcoder.cc | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/lib')

diff --git a/src/lib/player.cc b/src/lib/player.cc
index c66d091cf..92c2929ac 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -197,7 +197,7 @@ Player::setup_decoders ()
 					new FFmpegDecoder (
 						_film, fc, _video,
 						_audio && _playlist->audio_from() == Playlist::AUDIO_FFMPEG,
-						_subtitles && _film->with_subtitles(),
+						_subtitles,
 						_video_sync
 						)
 					);
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 6744e9193..e0e127d33 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -56,6 +56,10 @@ Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<Job> j)
 		_gain.reset (new Gain (f->log(), f->audio_gain()));
 	}
 
+	if (!f->with_subtitles ()) {
+		_player->disable_subtitles ();
+	}
+
 	if (_matcher) {
 		_player->connect_video (_matcher);
 		_matcher->connect_video (_encoder);
-- 
cgit v1.2.3