From 385635f00d39822389adbc99a2d5bdd992f16432 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 20 Jan 2025 00:31:32 +0100 Subject: Pass tolerant flag into Content::examine() and the ExamineContentJob. Along the way this helps to fix #2942. --- src/tools/dcpomatic_player.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/tools') diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 15ccf0a77..0ae5acf26 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -404,7 +404,7 @@ public: try { _stress.set_suspended (true); auto dcp = make_shared(dir); - auto job = make_shared(film, dcp); + auto job = make_shared(film, dcp, true); auto add_dcp_to_film = [this](weak_ptr weak_film, weak_ptr weak_job, weak_ptr weak_content) { @@ -579,7 +579,7 @@ private: DCPOMATIC_ASSERT (_film); auto dcp = dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); - dcp->examine (_film, shared_ptr()); + dcp->examine(_film, {}, true); /* Examining content re-creates the TextContent objects, so we must re-enable them */ for (auto i: dcp->text) { @@ -733,7 +733,7 @@ private: auto dcp = std::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT(dcp); dcp->add_ov (wx_to_std(c->GetPath())); - JobManager::instance()->add(make_shared(_film, dcp)); + JobManager::instance()->add(make_shared(_film, dcp, true)); bool const ok = display_progress(variant::wx::dcpomatic_player(), _("Loading content")); if (!ok || !report_errors_from_last_job(this)) { return; -- cgit v1.2.3