Fix setup of filters label on load; select first content in newly-loaded films.
authorCarl Hetherington <cth@carlh.net>
Sat, 13 Jul 2013 12:06:52 +0000 (13:06 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 13 Jul 2013 12:06:52 +0000 (13:06 +0100)
src/wx/film_editor.cc

index 0828d5b79a55aab58380fcd1b79c0bb062da469b..7e13261aed2dacc9835e460480bd2cd49af2a6f8 100644 (file)
@@ -867,8 +867,12 @@ FilmEditor::set_film (shared_ptr<Film> f)
        film_changed (Film::DCP_VIDEO_FRAME_RATE);
        film_changed (Film::DCP_AUDIO_CHANNELS);
 
-       wxListEvent ev;
-       content_selection_changed (ev);
+       if (!_film->content().empty ()) {
+               set_selection (_film->content().front ());
+       } else {
+               wxListEvent ev;
+               content_selection_changed (ev);
+       }
 }
 
 /** Updates the sensitivity of lots of widgets to a given value.
@@ -1217,6 +1221,7 @@ FilmEditor::content_selection_changed (wxListEvent &)
        film_content_changed (s, FFmpegContentProperty::AUDIO_STREAMS);
        film_content_changed (s, FFmpegContentProperty::SUBTITLE_STREAM);
        film_content_changed (s, FFmpegContentProperty::SUBTITLE_STREAMS);
+       film_content_changed (s, FFmpegContentProperty::FILTERS);
        film_content_changed (s, SubtitleContentProperty::SUBTITLE_OFFSET);
        film_content_changed (s, SubtitleContentProperty::SUBTITLE_SCALE);
 }