From fff8fe22db864b967cf2de00d783d4b1bf925a38 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 8 Jan 2023 00:22:55 +0100 Subject: Compare LoadFont URIs and asset paths correctly (DoM #2402). --- src/interop_subtitle_asset.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/interop_subtitle_asset.cc b/src/interop_subtitle_asset.cc index 1e0fe180..b815da55 100644 --- a/src/interop_subtitle_asset.cc +++ b/src/interop_subtitle_asset.cc @@ -241,7 +241,11 @@ InteropSubtitleAsset::resolve_fonts (vector> assets) for (auto load_font_node: _load_font_nodes) { auto iter = std::find_if(_fonts.begin(), _fonts.end(), [load_font_node](Font const& font) { return font.load_id == load_font_node->id; }); - if (iter == _fonts.end() && font->file() && load_font_node->uri == font->file()->leaf().string()) { + + DCP_ASSERT(_file); + auto const path_in_load_font_node = _file->parent_path() / load_font_node->uri; + + if (iter == _fonts.end() && font->file() && path_in_load_font_node == *font->file()) { _fonts.push_back(Font(load_font_node->id, asset->id(), font->file().get())); } } -- cgit v1.2.3