From: Carl Hetherington <cth@carlh.net>
Date: Tue, 7 Jun 2022 19:03:37 +0000 (+0200)
Subject: Don't search for empty font names to avoid random fonts being chosen.
X-Git-Tag: v2.16.14~16
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=e6ebc314597b0e52ebfdbc7190d847adc5c6adcb;hp=1ff553f6752469b940b5c59e2a619e71736e7611;p=dcpomatic.git

Don't search for empty font names to avoid random fonts being chosen.
---

diff --git a/src/lib/string_text_file_content.cc b/src/lib/string_text_file_content.cc
index eea9362bb..934144fa4 100644
--- a/src/lib/string_text_file_content.cc
+++ b/src/lib/string_text_file_content.cc
@@ -40,6 +40,7 @@ using std::list;
 using std::make_shared;
 using std::shared_ptr;
 using std::string;
+using boost::optional;
 using dcp::raw_convert;
 using namespace dcpomatic;
 
@@ -78,7 +79,10 @@ StringTextFileContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job
 	}
 
 	for (auto name: names) {
-		auto path = FontConfig::instance()->system_font_with_name(name);
+		optional<boost::filesystem::path> path;
+		if (!name.empty()) {
+			path = FontConfig::instance()->system_font_with_name(name);
+		}
 		if (path) {
 			only_text()->add_font(make_shared<Font>(name, *path));
 		} else {