X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_content.cc;h=b111bdb2a242b9aee2ba7ecb4730a61418bd4368;hb=323b8cbb0b95297fbd027ffdc4ea5003b59ef25f;hp=3bae6e88fb572e686c418995759adcc2d698752f;hpb=c7916079e06d985121842962b9736a6673e22dfe;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 3bae6e88f..b111bdb2a 100644
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -74,8 +74,18 @@ DCPSubtitleContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 
 	sc->fix_empty_font_ids ();
 
-	for (auto i: sc->load_font_nodes()) {
-		only_text()->add_font(make_shared<Font>(i->id));
+	auto font_data = sc->font_data();
+	for (auto node: sc->load_font_nodes()) {
+		auto data = font_data.find(node->id);
+		if (data != font_data.end()) {
+			only_text()->add_font(make_shared<Font>(node->id, data->second));
+		} else {
+			only_text()->add_font(make_shared<Font>(node->id));
+		}
+	}
+
+	if (only_text()->fonts().empty()) {
+		only_text()->add_font(make_shared<Font>(""));
 	}
 }