Merge mxe branch.

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

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 91ffe365f3b674004078b03f09d44ab14921ce52..527c275a4b10406ec7edad982f033feb556c4f86 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -380,6 +380,7 @@ DCPPanel::film_changed (int p)
                checked_set (_frame_rate_spin, _film->video_frame_rate ());
 
                _best_frame_rate->Enable (_film->best_video_frame_rate () != _film->video_frame_rate ());
+               setup_dcp_name ();
                break;
        }
        case Film::AUDIO_CHANNELS:
@@ -692,7 +693,7 @@ DCPPanel::make_video_panel ()
        _j2k_bandwidth->Bind    (wxEVT_SPINCTRL,      boost::bind (&DCPPanel::j2k_bandwidth_changed, this));
        /* Also listen to wxEVT_TEXT so that typing numbers directly in is always noticed */
        _j2k_bandwidth->Bind    (wxEVT_TEXT,          boost::bind (&DCPPanel::j2k_bandwidth_changed, this));
-       _resolution->Bind       (wxEVT_CHOICE,       boost::bind (&DCPPanel::resolution_changed, this));
+       _resolution->Bind       (wxEVT_CHOICE,        boost::bind (&DCPPanel::resolution_changed, this));
        _three_d->Bind          (wxEVT_CHECKBOX,      boost::bind (&DCPPanel::three_d_changed, this));
 
        BOOST_FOREACH (Ratio const * i, Ratio::containers()) {