Note whether subtitle colour is forced or not.

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

diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index 3de097215f6d0b2df51dbc33cbeadf5d15a0016f..eecfce19dde7f05a65fcee9200eab9f4536317cf 100644 (file)
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -75,8 +75,10 @@ SubtitleDecoder::emit_text_start (ContentTime from, list<dcp::SubtitleString> s)
                boost::algorithm::replace_all (t, ">", "&gt;");
                i.set_text (t);
 
-               /* Force our configured appearance */
-               i.set_colour (content()->colour());
+               /* Set any forced appearance */
+               if (content()->colour()) {
+                       i.set_colour (*content()->colour());
+               }
                i.set_effect_colour (content()->effect_colour());
                if (content()->outline()) {
                        i.set_effect (dcp::BORDER);