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

diff --git a/ChangeLog b/ChangeLog
index 07279d8f5862fc135719267f324c019c8fcd0c1b..e78fdab85fc5c012d2695c640369cde08097775a 100644 (file)
--- 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 3cd9d66e2e1c5d034e3510c5475af2b508ba8e17..92069cb601c04dd2e08000afa317e3c6cad12e7e 100644 (file)
--- 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();
        }