Don't make unique copies of identical font files.

1 files changed, 8 insertions, 1 deletions

diff --git a/src/combine.cc b/src/combine.cc
index fc98e7e8..a97ec09b 100644
--- a/src/combine.cc
+++ b/src/combine.cc
@@ -126,6 +126,7 @@ dcp::combine (
 
 	vector<path> paths;
 	vector<shared_ptr<dcp::Asset>> assets;
+	set<string> font_uuids;
 
 	for (auto i: inputs) {
 		DCP dcp (i);
@@ -150,7 +151,13 @@ dcp::combine (
 				auto fonts = sub->fonts();
 				for (auto const& k: fonts) {
 					if (k.file) {
-						sub->set_font_file(k.load_id, make_unique(output / k.file->filename()));
+						/* If we see a font file with the same UUID as another we don't want to include a
+						 * uniquely-named copy of it (otherwise we'll end up with multiple assets with
+						 * different filenames but the same UUID) so check for that here.
+						 */
+						if (font_uuids.insert(k.uuid).second) {
+							sub->set_font_file(k.load_id, make_unique(output / k.file->filename()));
+						}
 					}
 				}
 				auto file = sub->file();