summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/parse/subtitle.cc2
-rw-r--r--src/subtitle_asset.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/parse/subtitle.cc b/src/parse/subtitle.cc
index 471d62b7..612af716 100644
--- a/src/parse/subtitle.cc
+++ b/src/parse/subtitle.cc
@@ -36,7 +36,7 @@ Font::Font (shared_ptr<const cxml::Node> node)
id = node->optional_string_attribute ("Id").get_value_or ("");
size = node->optional_number_attribute<int64_t> ("Size").get_value_or (0);
- italic = node->optional_bool_attribute ("Italic").get_value_or (false);
+ italic = node->optional_bool_attribute ("Italic");
optional<string> c = node->optional_string_attribute ("Color");
if (c) {
color = Color (c.get ());
diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc
index 5decc1e3..ca91e2c7 100644
--- a/src/subtitle_asset.cc
+++ b/src/subtitle_asset.cc
@@ -386,7 +386,7 @@ SubtitleAsset::write_xml (ostream& s) const
font->set_attribute ("Weight", "normal");
}
- if (!subtitle ||
+ if (!subtitle || font_changed ||
(last_in != (*i)->in() ||
last_out != (*i)->out() ||
last_fade_up_time != (*i)->fade_up_time() ||
@@ -412,6 +412,6 @@ SubtitleAsset::write_xml (ostream& s) const
text->add_child_text ((*i)->text());
}
- doc.write_to_stream_formatted (s);
+ doc.write_to_stream_formatted (s, "UTF-8");
}