diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-05-28 02:12:39 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-05-28 12:56:13 +0200 |
| commit | f0c3c3830257ee7281ea9c5e5d49feb228a2fa20 (patch) | |
| tree | f99f7040310622cddf7a5d2b01ec8f5186cfb308 | |
| parent | f2ef41cd8c3aff05d34473c6255622a6babe3afd (diff) | |
Don't unconditionally clear _fonts when inspecting assets.2536-interop-subs
| -rw-r--r-- | src/interop_subtitle_asset.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/interop_subtitle_asset.cc b/src/interop_subtitle_asset.cc index 0116c11c..d0c80f5e 100644 --- a/src/interop_subtitle_asset.cc +++ b/src/interop_subtitle_asset.cc @@ -230,8 +230,6 @@ InteropSubtitleAsset::write (boost::filesystem::path p) const void InteropSubtitleAsset::resolve_fonts (vector<shared_ptr<Asset>> assets) { - _fonts.clear(); - for (auto asset: assets) { auto font = dynamic_pointer_cast<FontAsset>(asset); if (!font) { @@ -243,7 +241,12 @@ InteropSubtitleAsset::resolve_fonts (vector<shared_ptr<Asset>> assets) for (auto load_font_node: _load_font_nodes) { auto const path_in_load_font_node = _file->parent_path() / load_font_node->uri; if (font->file() && path_in_load_font_node == *font->file()) { - _fonts.push_back(Font(load_font_node->id, asset->id(), font->file().get())); + auto existing = std::find_if(_fonts.begin(), _fonts.end(), [load_font_node](Font const& font) { return font.load_id == load_font_node->id; }); + if (existing != _fonts.end()) { + *existing = Font(load_font_node->id, asset->id(), font->file().get()); + } else { + _fonts.push_back(Font(load_font_node->id, asset->id(), font->file().get())); + } } } } |