From 6e49be4baede66ce5f89c45fffafb6bdfff95401 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 27 Aug 2023 00:17:58 +0200 Subject: Fix refusal to reference overlapping but different text content (#2599). --- src/lib/dcp_content.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 928ba3381..770e5bfad 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -787,8 +787,8 @@ DCPContent::can_reference_text (shared_ptr film, TextType type, stri /// TRANSLATORS: this string will follow "Cannot reference this DCP: " return can_reference( film, - [](shared_ptr c) { - return !c->text.empty(); + [type](shared_ptr c) { + return std::find_if(c->text.begin(), c->text.end(), [type](shared_ptr t) { return t->type() == type; }) != c->text.end(); }, _("they overlap other text content; remove the other content."), why_not -- cgit v1.2.3