summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-18 19:27:37 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-18 19:27:37 +0100
commit23cf9a87b290c32bfef24c6674734bed608d13c6 (patch)
tree57536ac79a714210961dbff9cc2035b1bb89608b /src
parent308cf01bf7ba51af4b09a06d8483c78a1eecb7f6 (diff)
Fix subtitle stream sensitivity again.
Diffstat (limited to 'src')
-rw-r--r--src/wx/film_editor.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 8f391f5cd..0b9f86988 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -757,9 +757,6 @@ FilmEditor::film_content_changed (weak_ptr<Content> weak_content, int property)
_subtitle_stream->Clear ();
if (ffmpeg_content) {
vector<shared_ptr<FFmpegSubtitleStream> > s = ffmpeg_content->subtitle_streams ();
- if (s.empty ()) {
- _subtitle_stream->Enable (false);
- }
for (vector<shared_ptr<FFmpegSubtitleStream> >::iterator i = s.begin(); i != s.end(); ++i) {
_subtitle_stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx (lexical_cast<string> ((*i)->id))));
}
@@ -1061,6 +1058,7 @@ FilmEditor::setup_subtitle_control_sensitivity ()
_subtitle_offset->Enable (j);
_subtitle_scale->Enable (j);
+ _subtitle_stream->Enable (j);
}
void