summaryrefslogtreecommitdiff
path: root/src/lib/subtitle_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-01-12 13:04:46 +0000
committerCarl Hetherington <cth@carlh.net>2018-01-13 00:06:28 +0000
commit99b4e0705e9007aabfec08ea2c8d1a84eda0d32e (patch)
treedde51223bd3745d1b93c977f722434353fa02afe /src/lib/subtitle_decoder.cc
parent10818d95000c291af776ed9ba1c847257ded4b1f (diff)
Note whether subtitle effect colour is forced or not.
Diffstat (limited to 'src/lib/subtitle_decoder.cc')
-rw-r--r--src/lib/subtitle_decoder.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index eecfce19d..8badf5183 100644
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -79,7 +79,9 @@ SubtitleDecoder::emit_text_start (ContentTime from, list<dcp::SubtitleString> s)
if (content()->colour()) {
i.set_colour (*content()->colour());
}
- i.set_effect_colour (content()->effect_colour());
+ if (content()->effect_colour()) {
+ i.set_effect_colour (*content()->effect_colour());
+ }
if (content()->outline()) {
i.set_effect (dcp::BORDER);
} else if (content()->shadow()) {