Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc
index 80b347587b16eb73f6d50620ca06352a0e01aa18..2f9b4760c67faf9006d751ea41d45097ac668f67 100644 (file)
--- a/src/wx/subtitle_appearance_dialog.cc
+++ b/src/wx/subtitle_appearance_dialog.cc
@@ -86,15 +86,15 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
        _table->Add (_fade_out, wxGBPosition (r, 1));
        ++r;
 
-       wxScrolled<wxPanel>* colours_panel = new wxScrolled<wxPanel> (this);
-       colours_panel->EnableScrolling (false, true);
-       colours_panel->ShowScrollbars (wxSHOW_SB_NEVER, wxSHOW_SB_ALWAYS);
-       colours_panel->SetScrollRate (0, 16);
+       if (_stream) {
+               wxScrolled<wxPanel>* colours_panel = new wxScrolled<wxPanel> (this);
+               colours_panel->EnableScrolling (false, true);
+               colours_panel->ShowScrollbars (wxSHOW_SB_NEVER, wxSHOW_SB_ALWAYS);
+               colours_panel->SetScrollRate (0, 16);
 
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-       table->AddGrowableCol (1, 1);
+               wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+               table->AddGrowableCol (1, 1);
 
-       if (_stream) {
                map<RGBA, RGBA> colours = _stream->colours ();
 
                wxStaticText* t = new wxStaticText (colours_panel, wxID_ANY, "");