summaryrefslogtreecommitdiff
path: root/src/lib/dcp_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-11-12 23:58:50 +0100
committerCarl Hetherington <cth@carlh.net>2019-11-12 23:58:50 +0100
commitf96413a2c0fb171d90e907d715a98224ba67021c (patch)
tree3a550d6a0c4081196da6f640c8ac94c2d9c43de5 /src/lib/dcp_content.cc
parent73799b11bdd90ef9ddd70bdd9bc3f4e1e12bcd07 (diff)
Fix crash when calling DCPContent::examine with no film.v2.15.33
Diffstat (limited to 'src/lib/dcp_content.cc')
-rw-r--r--src/lib/dcp_content.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 95f293b4d..d0f434e5a 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -180,6 +180,7 @@ DCPContent::read_sub_directory (boost::filesystem::path p)
}
}
+/** @param film Film, or 0 */
void
DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
{
@@ -198,7 +199,7 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
}
Content::examine (film, job);
- shared_ptr<DCPExaminer> examiner (new DCPExaminer(shared_from_this(), film->tolerant()));
+ shared_ptr<DCPExaminer> examiner (new DCPExaminer(shared_from_this(), film ? film->tolerant() : true));
if (examiner->has_video()) {
{