summaryrefslogtreecommitdiff
path: root/src/wx/dcp_text_track_dialog.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-04-09 21:20:10 +0200
committerCarl Hetherington <cth@carlh.net>2021-04-09 21:20:10 +0200
commitc27d14badb229c24533db65dbaee1939dce89455 (patch)
tree250f422babe86b56bac69fe45142fd1fd4d0ec11 /src/wx/dcp_text_track_dialog.cc
parentf10849bd52470a93f54bb90686aa9a3b1e72e796 (diff)
Make DCP text track language properly optional and ignore bad values on imported DCPs (#1950).
Diffstat (limited to 'src/wx/dcp_text_track_dialog.cc')
-rw-r--r--src/wx/dcp_text_track_dialog.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/dcp_text_track_dialog.cc b/src/wx/dcp_text_track_dialog.cc
index b884aba51..be31de0ce 100644
--- a/src/wx/dcp_text_track_dialog.cc
+++ b/src/wx/dcp_text_track_dialog.cc
@@ -33,7 +33,7 @@ DCPTextTrackDialog::DCPTextTrackDialog (wxWindow* parent)
add (_("Name"), true);
add (_name = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(300, -1)));
add (_("Language"), true);
- _language = new LanguageTagWidget (this, wxT(""), dcp::LanguageTag("en-US"));
+ _language = new LanguageTagWidget (this, wxT(""), boost::none);
add (_language->sizer());
layout ();
@@ -44,5 +44,5 @@ DCPTextTrack
DCPTextTrackDialog::get () const
{
DCPOMATIC_ASSERT (_language->get());
- return DCPTextTrack(wx_to_std(_name->GetValue()), _language->get()->to_string());
+ return DCPTextTrack(wx_to_std(_name->GetValue()), _language->get());
}