Hopefully sensitivity is a bit tidier.

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

diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc
index e410120221fb5b887f8314cf840fd173135d6058..2cc5197ce2a8d9e197e5521e17a47a17952d71ba 100644 (file)
--- a/src/wx/subtitle_panel.cc
+++ b/src/wx/subtitle_panel.cc
@@ -76,11 +76,11 @@ SubtitlePanel::film_changed (Film::Property property)
 {
        switch (property) {
        case Film::CONTENT:
-               setup_control_sensitivity ();
+               setup_sensitivity ();
                break;
        case Film::WITH_SUBTITLES:
                checked_set (_with_subtitles, _editor->film()->with_subtitles ());
-               setup_control_sensitivity ();
+               setup_sensitivity ();
                break;
        default:
                break;
@@ -107,7 +107,7 @@ SubtitlePanel::film_content_changed (shared_ptr<Content> c, int property)
                                _stream->SetSelection (wxNOT_FOUND);
                        }
                }
-               setup_control_sensitivity ();
+               setup_sensitivity ();
        } else if (property == SubtitleContentProperty::SUBTITLE_OFFSET) {
                checked_set (_offset, sc ? (sc->subtitle_offset() * 100) : 0);
        } else if (property == SubtitleContentProperty::SUBTITLE_SCALE) {
@@ -127,20 +127,16 @@ SubtitlePanel::with_subtitles_toggled (wxCommandEvent &)
 }
 
 void
-SubtitlePanel::setup_control_sensitivity ()
+SubtitlePanel::setup_sensitivity ()
 {
        bool h = false;
-       if (_editor->generally_sensitive() && _editor->film()) {
-               h = _editor->film()->has_subtitles ();
-       }
-       
-       _with_subtitles->Enable (h);
-
        bool j = false;
        if (_editor->film()) {
+               h = _editor->film()->has_subtitles ();
                j = _editor->film()->with_subtitles ();
        }
        
+       _with_subtitles->Enable (h);
        _offset->Enable (j);
        _scale->Enable (j);
        _stream->Enable (j);