Forward-port ISDCF naming tweak from 1.x.

1 files changed, 11 insertions, 1 deletions

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index f042e5eb1..d05171e41 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -270,7 +270,17 @@ DCPPanel::film_changed (int p)
 		checked_set (_use_isdcf_name, _film->use_isdcf_name ());
 		setup_dcp_name ();
 		bool const i = _film->use_isdcf_name ();
-		if (!i) {
+		if (i) {
+			/* We just chose to use the ISDCF name.  The user has probably unticked and re-ticked the box,
+			   so it's fairly likey that the film's name will now be a full ISDCF one.  Based on this guess,
+			   remove anything after the first _ in the film's name here.
+			*/
+			string const n = _film->name ();
+			if (n.find ("_") != string::npos) {
+				_film->set_name (n.substr (0, n.find ("_")));
+			}
+		} else {
+			/* Otherwise set the name to the full ISDCF name */
 			_film->set_name (_film->isdcf_name (true));
 		}
 		_edit_isdcf_button->Enable (i);