From: Carl Hetherington <cth@carlh.net>
Date: Mon, 13 May 2019 23:14:38 +0000 (+0100)
Subject: swaroop: fix incorrect start times with encrypted MP4 content.
X-Git-Tag: v2.15.4~1
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=61e5cbfc5e2f376c544b246e40c5990bc090033f

swaroop: fix incorrect start times with encrypted MP4 content.
---

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index e291b8e7c..97e12cc86 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -259,7 +259,9 @@ FFmpegContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 	ChangeSignaller<Content> cc1 (this, FFmpegContentProperty::SUBTITLE_STREAMS);
 	ChangeSignaller<Content> cc2 (this, FFmpegContentProperty::SUBTITLE_STREAM);
 
-	job->set_progress_unknown ();
+	if (job) {
+		job->set_progress_unknown ();
+	}
 
 	Content::examine (film, job);
 
diff --git a/src/wx/swaroop_controls.cc b/src/wx/swaroop_controls.cc
index c76ad590a..d8019a41e 100644
--- a/src/wx/swaroop_controls.cc
+++ b/src/wx/swaroop_controls.cc
@@ -471,6 +471,7 @@ SwaroopControls::select_playlist (int selected, int position)
 			if (kdm) {
 				try {
 					ffmpeg->add_kdm (*kdm);
+					ffmpeg->examine (_film, shared_ptr<Job>());
 				} catch (KDMError& e) {
 					error_dialog (this, "Could not load KDM.");
 				}