diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-23 09:48:36 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-23 09:48:36 +0100 |
| commit | 9980c63570fcab916ce209e486459cee4bd6c8db (patch) | |
| tree | 6ec8aadabd14de8c8ab0547ba6180f73800c38ef /src | |
| parent | e530b2e36d7646f7fd7bd0ca0ebcc0a40ddf52c1 (diff) | |
Some missing bits of caption type setup.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/caption_content.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/caption_content.cc b/src/lib/caption_content.cc index bbb1bacf3..4d0795190 100644 --- a/src/lib/caption_content.cc +++ b/src/lib/caption_content.cc @@ -121,6 +121,7 @@ CaptionContent::CaptionContent (Content* parent, cxml::ConstNodePtr node, int ve , _line_spacing (node->optional_number_child<double>("LineSpacing").get_value_or (1)) , _outline_width (node->optional_number_child<int>("OutlineWidth").get_value_or (2)) , _type (CAPTION_OPEN) + , _original_type (CAPTION_OPEN) { if (version >= 37) { _use = node->bool_child ("Use"); @@ -225,7 +226,7 @@ CaptionContent::CaptionContent (Content* parent, cxml::ConstNodePtr node, int ve connect_to_fonts (); _type = string_to_caption_type (node->optional_string_child("Type").get_value_or("open")); - _original_type = string_to_caption_type (node->optional_string_child("Type").get_value_or("open")); + _original_type = string_to_caption_type (node->optional_string_child("OriginalType").get_value_or("open")); } CaptionContent::CaptionContent (Content* parent, vector<shared_ptr<Content> > c) @@ -305,6 +306,8 @@ CaptionContent::CaptionContent (Content* parent, vector<shared_ptr<Content> > c) _fade_in = ref->fade_in (); _fade_out = ref->fade_out (); _outline_width = ref->outline_width (); + _type = ref->type (); + _original_type = ref->original_type (); connect_to_fonts (); } |