37423292ff0ff0210a2eeb4b2eea6740dcfa0a64 from master; fix DCP name update on changing...

diff --git a/ChangeLog b/ChangeLog
index 0da299a55790b3033424bd6cc14b22adce526b0b..e2d734168b2a9ea7a5a7c1e80e4d115cfcf9f0de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-05-17  Carl Hetherington  <cth@carlh.net>
+
+       * Fix Update DCP name on changing DCP standard (#570).
+

 2015-05-14  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.0.47 released.
 2015-05-14  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.0.47 released.

diff --git a/TO_PORT b/TO_PORT
index 2478d3670959c2f52c51b37febbea70be89c0010..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1 +0,0 @@
-2bbe8112dd12f770844ce367751faf348d5414b0

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 88ecf88bd75cb1f15c1bb4d789e1bfc124c63a26..ccfe5711cf717b3b9586be6d0188308cc0f88a1c 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -344,6 +344,7 @@ DCPPanel::film_changed (int p)
                break;
        case Film::INTEROP:
                checked_set (_standard, _film->interop() ? 1 : 0);
                break;
        case Film::INTEROP:
                checked_set (_standard, _film->interop() ? 1 : 0);

+               setup_dcp_name ();

                break;
        default:
                break;
                break;
        default:
                break;