From: Carl Hetherington <cth@carlh.net>
Date: Wed, 30 Aug 2017 23:19:00 +0000 (+0100)
Subject: Fix erroneous re-use of video files after turning off burnt subtitles (#1113).
X-Git-Tag: v2.11.20~3
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=01b35c34a36f35a29899db2fd6c4759de89a8860

Fix erroneous re-use of video files after turning off burnt subtitles (#1113).
---

diff --git a/ChangeLog b/ChangeLog
index 07279d8f5..e78fdab85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-08-31  Carl Hetherington  <cth@carlh.net>
+
+	* Fix erroneous re-use of video files after turning off burnt subtitles (#1113).
+
 2017-08-30  Carl Hetherington  <cth@carlh.net>
 
 	* Updated es_ES translation from Manuel AC.
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 3cd9d66e2..92069cb60 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -397,7 +397,7 @@ FFmpegContent::identifier () const
 		s += "_" + video->identifier();
 	}
 
-	if (subtitle) {
+	if (subtitle && subtitle->use() && subtitle->burn()) {
 		s += "_" + subtitle->identifier();
 	}