diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-02-19 00:56:14 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-02-19 00:56:14 +0100 |
| commit | c59a10bcf428154c7d1c9e3fad4469af36bb7d91 (patch) | |
| tree | 63c73a306f8779638da79c30822f80973d808353 /src | |
| parent | 450b7465d99be7b53c95f168dbe757048b9bb363 (diff) | |
| parent | b7ebd9e9333439b5a1e04ee3d422ad2330ef1e58 (diff) | |
Merge tag 'v2.16.76' into v2.17.x
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/dcp_content.cc | 3 | ||||
| -rw-r--r-- | src/lib/dcp_decoder.cc | 1 | ||||
| -rw-r--r-- | src/wx/controls.cc | 4 | ||||
| -rw-r--r-- | src/wx/job_view.cc | 3 | ||||
| -rw-r--r-- | src/wx/supporters.cc | 3 |
5 files changed, 13 insertions, 1 deletions
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index d92c64ce0..4d1ab4f88 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -746,6 +746,9 @@ DCPContent::can_reference_text (shared_ptr<const Film> film, TextType type, stri } catch (dcp::ReadError &) { /* We couldn't read the DCP, so it's probably missing */ return false; + } catch (DCPError &) { + /* We couldn't read the DCP, so it's probably missing */ + return false; } catch (dcp::KDMDecryptionError &) { /* We have an incorrect KDM */ return false; diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index cf8521d48..303126caa 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -105,7 +105,6 @@ DCPDecoder::DCPDecoder (shared_ptr<const Film> film, shared_ptr<const DCPContent if (old && old->lazy_digest() == _lazy_digest) { _reels = old->_reels; } else { - auto cpl_list = dcp::find_and_resolve_cpls(content->directories(), tolerant); if (cpl_list.empty()) { diff --git a/src/wx/controls.cc b/src/wx/controls.cc index 097daf944..b6270f91a 100644 --- a/src/wx/controls.cc +++ b/src/wx/controls.cc @@ -243,6 +243,10 @@ Controls::slider_moved (bool page) void Controls::slider_released () { + if (!_film) { + return; + } + /* Restart after a drag */ _viewer.resume(); _slider_being_moved = false; diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc index 41a1af012..efe17f4de 100644 --- a/src/wx/job_view.cc +++ b/src/wx/job_view.cc @@ -125,6 +125,9 @@ JobView::progress () /* Watch out for < > in the error string */ boost::algorithm::replace_all (s, "<", "<"); boost::algorithm::replace_all (s, ">", ">"); +#ifdef DCPOMATIC_LINUX + boost::algorithm::replace_all(s, "_", "__"); +#endif whole += s; if (whole != _last_message) { _message->SetLabelMarkup (std_to_wx (whole)); diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc index fdbedde69..6f987de45 100644 --- a/src/wx/supporters.cc +++ b/src/wx/supporters.cc @@ -221,6 +221,7 @@ supported_by.Add (wxT ("Devon Collins")); supported_by.Add (wxT ("Sodalite Color")); supported_by.Add (wxT ("XD Colorgrading")); supported_by.Add (wxT ("Adam Colt")); +supported_by.Add (wxT ("RooandKanga Production Company")); supported_by.Add (wxT ("Marketplace Media Company")); supported_by.Add (wxT ("The Archetype Company")); supported_by.Add (wxT ("Conta'm")); @@ -313,6 +314,7 @@ supported_by.Add (wxT ("Simon Edwards")); supported_by.Add (wxT ("Arthur Edwards")); supported_by.Add (wxT ("Si Edwards")); supported_by.Add (wxT ("Thomas Eingartner")); +supported_by.Add (wxT ("Gabriel Eiriz")); supported_by.Add (wxT ("Chris Eller")); supported_by.Add (wxT ("Thore Engebretsen")); supported_by.Add (wxT ("Mark Engebretson")); @@ -1173,6 +1175,7 @@ supported_by.Add (wxT ("The Savoy Theater")); supported_by.Add (wxT ("Lark Theater")); supported_by.Add (wxT ("Port Elmsley Drive-In Theater")); supported_by.Add (wxT ("Tryon Theatre")); +supported_by.Add (wxT ("The Rustic Theatre")); supported_by.Add (wxT ("Kiggins Theatre")); supported_by.Add (wxT ("The Tryon Theatre")); supported_by.Add (wxT ("Peter Hoopes for the Everett Theatre")); |