Cope with loading a film containing a missing DCP which itself contains subtitles.

[dcpomatic.git] / src / lib / screen.cc

diff --git a/src/lib/screen.cc b/src/lib/screen.cc
index dbf013111e3465637ddcd210405fe5536e5aa9ee..febf9085c3d344af6a77487c5aed1c04a60a7148 100644 (file)
--- a/src/lib/screen.cc
+++ b/src/lib/screen.cc
@@ -93,7 +93,7 @@ kdm_for_screen (
        dcp::LocalTime const begin(valid_from, dcp::UTCOffset(cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0));
        dcp::LocalTime const end  (valid_to,   dcp::UTCOffset(cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0));
 
-       period_checks.push_back(check_kdm_and_certificate_validity_periods(screen->recipient.get(), begin, end));
+       period_checks.push_back(check_kdm_and_certificate_validity_periods(cinema ? cinema->name : "", screen->name, screen->recipient.get(), begin, end));
 
        auto signer = Config::instance()->signer_chain();
        if (!signer->valid()) {
@@ -116,6 +116,6 @@ kdm_for_screen (
        name_values['e'] = end.date() + " " + end.time_of_day(true, false);
        name_values['i'] = kdm.cpl_id();
 
-       return make_shared<KDMWithMetadata>(name_values, cinema.get(), cinema ? cinema->emails : list<string>(), kdm);
+       return make_shared<KDMWithMetadata>(name_values, cinema.get(), cinema ? cinema->emails : vector<string>(), kdm);
 }