Merge branch 'video-player' of ssh://houllier/home/carl/git/dvdomatic into video...

[dcpomatic.git] / src / wx / film_editor.cc

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 8cf8c5fda9e7ebf84a88d9ac0676d379a1f8bf77..22fd1cc1434bbbad958677ee67c60dbaa4b272d4 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -963,9 +963,15 @@ FilmEditor::setup_subtitle_control_sensitivity ()
        }
        
        _with_subtitles->Enable (h);
-       _subtitle_stream->Enable (_film->with_subtitles ());
-       _subtitle_offset->Enable (_film->with_subtitles ());
-       _subtitle_scale->Enable (_film->with_subtitles ());
+
+       bool j = false;
+       if (_film) {
+               j = _film->with_subtitles ();
+       }
+       
+       _subtitle_stream->Enable (j);
+       _subtitle_offset->Enable (j);
+       _subtitle_scale->Enable (j);
 }
 
 void