Compare LoadFont URIs and asset paths correctly (DoM #2402).

[libdcp.git] / src / interop_subtitle_asset.cc

diff --git a/src/interop_subtitle_asset.cc b/src/interop_subtitle_asset.cc
index 1e0fe180636e71566bd747c3a8d4ab11f26a79bb..b815da555e411064f48f6997f73e513564e7b2b7 100644 (file)
--- a/src/interop_subtitle_asset.cc
+++ b/src/interop_subtitle_asset.cc
@@ -241,7 +241,11 @@ InteropSubtitleAsset::resolve_fonts (vector<shared_ptr<Asset>> 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()));
                        }
                }